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/gtkitemfactory.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/gtkitemfactory.c')
| -rw-r--r-- | gtk/gtkitemfactory.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/gtk/gtkitemfactory.c b/gtk/gtkitemfactory.c index bec6ab6739..8f24aaca51 100644 --- a/gtk/gtkitemfactory.c +++ b/gtk/gtkitemfactory.c @@ -29,7 +29,6 @@ #include <config.h> -#include "gtkalias.h" #include "gtkitemfactory.h" #include "gtk/gtkmenubar.h" #include "gtk/gtkmenu.h" @@ -54,6 +53,7 @@ #undef GTK_DISABLE_DEPRECATED #include "gtk/gtkoptionmenu.h" #define GTK_DISABLE_DEPRECATED +#include "gtkalias.h" /* --- defines --- */ #define ITEM_FACTORY_STRING ((gchar*) item_factory_string) @@ -1598,3 +1598,6 @@ gtk_item_factory_set_translate_func (GtkItemFactory *ifactory, ifactory->translate_data = data; ifactory->translate_notify = notify; } + +#define __GTK_ITEM_FACTORY_C__ +#include "gtkaliasdef.c" |