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/gtkstyle.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/gtkstyle.c')
| -rw-r--r-- | gtk/gtkstyle.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/gtk/gtkstyle.c b/gtk/gtkstyle.c index 8f9adc4d3a..d014c798fb 100644 --- a/gtk/gtkstyle.c +++ b/gtk/gtkstyle.c @@ -28,7 +28,6 @@ #include <math.h> #include <stdlib.h> #include <string.h> -#include "gtkalias.h" #include "gtkgc.h" #include "gtkmarshalers.h" #include "gtkrc.h" @@ -38,6 +37,7 @@ #include "gtkthemes.h" #include "gtkiconfactory.h" #include "gtksettings.h" /* _gtk_settings_parse_convert() */ +#include "gtkalias.h" #define LIGHTNESS_MULT 1.3 #define DARKNESS_MULT 0.7 @@ -6766,3 +6766,6 @@ gtk_draw_insertion_cursor (GtkWidget *widget, if (area) gdk_gc_set_clip_rectangle (gc, NULL); } + +#define __GTK_STYLE_C__ +#include "gtkaliasdef.c" |