Make PLT-reduction work with gcc4, and don't include everything in
2005-03-15 Matthias Clasen <mclasen@redhat.com> 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.
This commit is contained in:
committed by
Matthias Clasen
parent
34bfd71279
commit
2a2d769d42
@ -33,7 +33,6 @@
|
||||
#include <limits.h>
|
||||
#include <errno.h>
|
||||
|
||||
#include "gdkalias.h"
|
||||
#include "gdk.h"
|
||||
#include "gdkx.h"
|
||||
|
||||
@ -41,6 +40,7 @@
|
||||
#include "gdkinternals.h"
|
||||
#include "gdkdisplay-x11.h"
|
||||
#include "gdkkeysyms.h"
|
||||
#include "gdkalias.h"
|
||||
|
||||
#ifdef HAVE_XKB
|
||||
#include <X11/XKBlib.h>
|
||||
@ -1446,3 +1446,6 @@ _gdk_x11_get_group_for_state (GdkDisplay *display,
|
||||
return (state & keymap_impl->group_switch_mask) ? 1 : 0;
|
||||
}
|
||||
}
|
||||
|
||||
#define __GDK_KEYS_X11_C__
|
||||
#include "gdkaliasdef.c"
|
||||
|
||||
Reference in New Issue
Block a user