From cca8dd63475ab582d8592039f1f69d7f22a3b928 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sun, 20 Mar 2005 07:01:23 +0000 Subject: Make PLT-reduction work with gcc4, and don't include everything in 2005-03-20 Matthias Clasen 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. --- gtk/gtkrc.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'gtk/gtkrc.c') 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 #include -#include "gtkalias.h" #include #include @@ -57,6 +56,8 @@ #include "gtksettings.h" #include "gtkwindow.h" +#include "gtkalias.h" + #ifdef G_OS_WIN32 #include #endif @@ -3965,3 +3966,6 @@ gtk_rc_parse (const gchar *filename) } #endif + +#define __GTK_RC_C__ +#include "gtkaliasdef.c" -- cgit v1.2.1