From 2a2d769d423ad79f606b995f9016dc59e72d9d8c Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Wed, 16 Mar 2005 03:17:27 +0000 Subject: Make PLT-reduction work with gcc4, and don't include everything in 2005-03-15 Matthias Clasen Make PLT-reduction work with gcc4, and don't include everything in gdkalias.h: * gdk/gdk.symbols: Group symbols by header and source file. * gdk/makegdkalias.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 makegdkalias.pl -def * gdk/Makefile.am (gdkaliasdef.c): Add a rule to generate this file. * gdk/*.c, gdk/x11/*.c: Include gdkalias.h after the other headers, include gdkaliasdef.c at the bottom. --- gdk/gdkkeynames.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'gdk/gdkkeynames.c') diff --git a/gdk/gdkkeynames.c b/gdk/gdkkeynames.c index 8d9124d75d..00dd758824 100644 --- a/gdk/gdkkeynames.c +++ b/gdk/gdkkeynames.c @@ -29,9 +29,9 @@ #include #include -#include "gdkalias.h" #include "gdkkeysyms.h" #include "gdkinternals.h" +#include "gdkalias.h" /* Key handling not part of the keymap */ @@ -102,3 +102,5 @@ gdk_keyval_from_name (const gchar *keyval_name) return GDK_VoidSymbol; } +#define __GDK_KEYNAMES_C__ +#include "gdkaliasdef.c" -- cgit v1.2.1