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/gtkcomboboxentry.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/gtkcomboboxentry.c')
-rw-r--r-- | gtk/gtkcomboboxentry.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/gtk/gtkcomboboxentry.c b/gtk/gtkcomboboxentry.c index 7598596588..9c3e698594 100644 --- a/gtk/gtkcomboboxentry.c +++ b/gtk/gtkcomboboxentry.c @@ -18,7 +18,6 @@ */ #include <config.h> -#include "gtkalias.h" #include "gtkcomboboxentry.h" #include "gtkcelllayout.h" @@ -26,6 +25,7 @@ #include "gtkcellrenderertext.h" #include "gtkintl.h" +#include "gtkalias.h" #define GTK_COMBO_BOX_ENTRY_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GTK_TYPE_COMBO_BOX_ENTRY, GtkComboBoxEntryPrivate)) @@ -382,3 +382,6 @@ gtk_combo_box_entry_new_text (void) return entry_box; } + +#define __GTK_COMBO_BOX_ENTRY_C__ +#include "gtkaliasdef.c" |