diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2005-03-20 07:01:23 +0000 |
|---|---|---|
| committer | Matthias Clasen <matthiasc@src.gnome.org> | 2005-03-20 07:01:23 +0000 |
| commit | cca8dd63475ab582d8592039f1f69d7f22a3b928 (patch) | |
| tree | f800dcc62e1ab8a0010e774a05e669b14c3ff5e1 /gtk/gtkrc.c | |
| parent | b39b0bfc0471258285169113bc176320b0b5ae71 (diff) | |
| download | gtk+-cca8dd63475ab582d8592039f1f69d7f22a3b928.tar.gz | |
Make PLT-reduction work with gcc4, and don't include everything in
2005-03-20 Matthias Clasen <mclasen@redhat.com>
Make PLT-reduction work with gcc4, and don't include
everything in gdkalias.h:
* gtk/grk.symbols: Group symbols by header and source file.
* gtk/makegtkalias.pl: Protect definitions by the same
preprocessor symbols used to guard the headers. Move
the alias declarations to a separate file which is
produced when calling makegtkalias.pl -def
* gdk/Makefile.am (gtkaliasdef.c): Add a rule to generate
this file.
* gtk/*.c: Include gtkalias.h after the other headers,
include gtkaliasdef.c at the bottom.
* gtk/*.h: Small cleanups.
Diffstat (limited to 'gtk/gtkrc.c')
| -rw-r--r-- | gtk/gtkrc.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/gtk/gtkrc.c b/gtk/gtkrc.c index 0dd4a52197..1953cd0844 100644 --- a/gtk/gtkrc.c +++ b/gtk/gtkrc.c @@ -39,7 +39,6 @@ #include <stdio.h> #include <stdlib.h> -#include "gtkalias.h" #include <glib.h> #include <glib/gstdio.h> @@ -57,6 +56,8 @@ #include "gtksettings.h" #include "gtkwindow.h" +#include "gtkalias.h" + #ifdef G_OS_WIN32 #include <io.h> #endif @@ -3965,3 +3966,6 @@ gtk_rc_parse (const gchar *filename) } #endif + +#define __GTK_RC_C__ +#include "gtkaliasdef.c" |