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.
2024-11-09 18:30:08 +00:00 · 2005-03-16 03:17:27 +00:00 · 2005-03-16 03:17:27 +00:00 · 2a2d769d42
commit 2a2d769d42
parent 34bfd71279
62 changed files with 1258 additions and 568 deletions
--- a/15
+++ b/15
@ -1,3 +1,18 @@
+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.
+
 2005-03-16  Tor Lillqvist  <tml@novell.com>

 	* gdk/win32/gdkdisplay-win32.c (_win32_on_clipboard_change): Print
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@ -1,3 +1,18 @@
+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.
+
 2005-03-16  Tor Lillqvist  <tml@novell.com>

 	* gdk/win32/gdkdisplay-win32.c (_win32_on_clipboard_change): Print
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@ -1,3 +1,18 @@
+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.
+
 2005-03-16  Tor Lillqvist  <tml@novell.com>

 	* gdk/win32/gdkdisplay-win32.c (_win32_on_clipboard_change): Print
--- a/gdk/Makefile.am
+++ b/gdk/Makefile.am
@ -177,11 +177,14 @@ uninstall-ms-lib:
 endif

 gdk.def: gdk.symbols
-	(echo -e EXPORTS; $(CPP) -P -DGDK_WINDOWING_WIN32 -DINCLUDE_VARIABLES - <$(srcdir)/gdk.symbols | sed -e '/^$$/d' -e 's/^/	/' -e 's/G_GNUC_[^ ]*//g') > gdk.def
+	(echo -e EXPORTS; $(CPP) -P -DALL_FILES -DGDK_WINDOWING_WIN32 -DINCLUDE_VARIABLES - <$(srcdir)/gdk.symbols | sed -e '/^$$/d' -e 's/^/	/' -e 's/G_GNUC_[^ ]*//g') > gdk.def

 gdkalias.h: gdk.symbols
 	 $(PERL) $(srcdir)/makegdkalias.pl < $(srcdir)/gdk.symbols > gdkalias.h

+gdkaliasdef.c: gdk.symbols
+	 $(PERL) $(srcdir)/makegdkalias.pl -def < $(srcdir)/gdk.symbols > gdkaliasdef.c
+
 if OS_LINUX
 TESTS = abicheck.sh
 endif
@ -215,6 +218,7 @@ endif
 #note: not gdkconfig.h
 BUILT_SOURCES =					\
 	gdkalias.h				\
+	gdkaliasdef.c				\
 	gdkenumtypes.h				\
 	gdkenumtypes.c				\
 	gdkmarshalers.h 			\
@ -235,8 +239,9 @@ stamp-gdkenumtypes.h: @REBUILD@ $(gdk_public_h_sources) Makefile
 	&& echo timestamp > $(@F)
 gdkenumtypes.c: @REBUILD@ $(gdk_public_h_sources) Makefile
 	( cd $(srcdir) && glib-mkenums \
-			--fhead "#define GDK_ENABLE_BROKEN\n#include \"gdkalias.h\"\n#include \"gdk.h\"" \
-		--fprod "\n/* enumerations from \"@filename@\" */" \
+			--fhead "#define GDK_ENABLE_BROKEN\n#include \"gdk.h\"\n#include \"gdkalias.h\"\n" \
+  			--fprod "\n/* enumerations from \"@filename@\" */" \
+			--ftail "\n#define __GDK_ENUM_TYPES_C__\n#include \"gdkaliasdef.c\"\n" \
 			--vhead "GType\n@enum_name@_get_type (void)\n{\n  static GType etype = 0;\n  if (etype == 0) {\n    static const G@Type@Value values[] = {" \
 			--vprod "      { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \
 			--vtail "      { 0, NULL, NULL }\n    };\n    etype = g_@type@_register_static (\"@EnumName@\", values);\n  }\n  return etype;\n}\n" \
--- a/gdk/abicheck.sh
+++ b/gdk/abicheck.sh
@ -1,5 +1,5 @@
 #! /bin/sh

-cpp -P -DGDK_WINDOWING_X11 ${srcdir:-.}/gdk.symbols | sed -e '/^$/d' -e 's/ G_GNUC.*$//' | sort > expected-abi
+cpp -P -DALL_FILES -DGDK_ENABLE_BROKEN -DGDK_WINDOWING_X11 ${srcdir:-.}/gdk.symbols | sed -e '/^$/d' -e 's/ G_GNUC.*$//' | sort > expected-abi
 nm -D .libs/libgdk-x11-2.0.so | grep " T " | cut -d ' ' -f 3 | sort > actual-abi
 diff -u expected-abi actual-abi && rm expected-abi actual-abi
--- a/gdk/gdk.c
+++ b/gdk/gdk.c
@ -29,7 +29,6 @@
 #include <string.h>
 #include <stdlib.h>

-#include "gdkalias.h"
 #include "gdk.h"
 #include "gdkinternals.h"
 #include "gdkintl.h"
@ -37,6 +36,7 @@
 #ifndef HAVE_XCONVERTCASE
 #include "gdkkeysyms.h"
 #endif
+#include "gdkalias.h"

 typedef struct _GdkPredicate  GdkPredicate;

@ -455,3 +455,6 @@ gdk_set_program_class (const char *program_class)

  gdk_progclass = g_strdup (program_class);
 }
+
+#define __GDK_C__
+#include "gdkaliasdef.c"
--- a/gdk/gdk.symbols
+++ b/gdk/gdk.symbols
--- a/gdk/gdkcolor.c
+++ b/gdk/gdkcolor.c
@ -27,10 +27,10 @@
 #include <config.h>
 #include <time.h>

-#include "gdkalias.h"
 #include "gdkscreen.h"
 #include "gdkcolor.h"
 #include "gdkinternals.h"
+#include "gdkalias.h"

 /**
 * gdk_colormap_ref:
@ -371,3 +371,5 @@ gdk_colormap_get_system (void)
  return gdk_screen_get_system_colormap (gdk_screen_get_default ());
 }

+#define __GDK_COLOR_C__
+#include "gdkaliasdef.c"
--- a/gdk/gdkcursor.c
+++ b/gdk/gdkcursor.c
@ -25,10 +25,10 @@
 */

 #include <config.h>
-#include "gdkalias.h"
 #include "gdkcursor.h"
 #include "gdkdisplay.h"
 #include "gdkinternals.h"
+#include "gdkalias.h"

 GType
 gdk_cursor_get_type (void)
@ -98,3 +98,6 @@ gdk_cursor_new (GdkCursorType cursor_type)
 {
  return gdk_cursor_new_for_display (gdk_display_get_default(), cursor_type);
 }
+
+#define __GDK_CURSOR_C__
+#include "gdkaliasdef.c"
--- a/gdk/gdkdisplay.c
+++ b/gdk/gdkdisplay.c
@ -23,12 +23,12 @@

 #include <config.h>
 #include <glib.h>
-#include "gdkalias.h"
 #include "gdk.h"		/* gdk_event_send_client_message() */
 #include "gdkdisplay.h"
 #include "gdkinternals.h"
 #include "gdkmarshalers.h"
 #include "gdkscreen.h"
+#include "gdkalias.h"

 enum {
  CLOSED,
@ -647,4 +647,5 @@ gdk_set_pointer_hooks (const GdkPointerHooks *new_hooks)
  return (GdkPointerHooks *)result;
 }

-
+#define __GDK_DISPLAY_C__
+#include "gdkaliasdef.c"
--- a/gdk/gdkdisplaymanager.c
+++ b/gdk/gdkdisplaymanager.c
@ -26,7 +26,7 @@

 #include <config.h>

-#include "gdkalias.h"
+#include "gdkscreen.h"
 #include "gdkdisplay.h"
 #include "gdkdisplaymanager.h"

@ -35,6 +35,8 @@

 #include "gdkintl.h"

+#include "gdkalias.h"
+
 struct _GdkDisplayManager
 {
  GObject parent_instance;
@ -277,3 +279,5 @@ gdk_display_manager_list_displays (GdkDisplayManager *display_manager)
  return g_slist_copy (_gdk_displays);
 }

+#define __GDK_DISPLAY_MANAGER_C__
+#include "gdkaliasdef.c"
--- a/gdk/gdkdnd.c
+++ b/gdk/gdkdnd.c
@ -25,10 +25,10 @@
 */

 #include <config.h>
-#include "gdkalias.h"
 #include <gdkdnd.h>
 #include <gdkdrawable.h>
 #include <gdkdisplay.h>
+#include "gdkalias.h"

 /**
 * gdk_drag_find_window:
@ -77,6 +77,5 @@ gdk_drag_get_protocol (guint32          xid,
  return gdk_drag_get_protocol_for_display (gdk_display_get_default (), xid, protocol);
 }

-
-
-
+#define __GDK_DND_C__
+#include "gdkaliasdef.c"
--- a/gdk/gdkdraw.c
+++ b/gdk/gdkdraw.c
@ -26,13 +26,13 @@

 #include <config.h>
 #include <math.h>
-#include "gdkalias.h"
 #include "gdkdrawable.h"
 #include "gdkinternals.h"
 #include "gdkwindow.h"
 #include "gdkscreen.h"
 #include "gdk-pixbuf-private.h"
 #include "gdkpixbuf.h"
+#include "gdkalias.h"

 static GdkImage*    gdk_drawable_real_get_image (GdkDrawable     *drawable,
 						 gint             x,
@ -1965,3 +1965,6 @@ _gdk_drawable_get_scratch_gc (GdkDrawable *drawable,
      return screen->normal_gcs[depth];
    }
 }
+
+#define __GDK_DRAW_C__
+#include "gdkaliasdef.c"
--- a/gdk/gdkevents.c
+++ b/gdk/gdkevents.c
@ -27,9 +27,9 @@
 #include <config.h>
 #include <string.h>		/* For memset() */

-#include "gdkalias.h"
 #include "gdk.h"
 #include "gdkinternals.h"
+#include "gdkalias.h"

 typedef struct _GdkIOClosure GdkIOClosure;

@ -1221,3 +1221,6 @@ gdk_setting_get (const gchar *name,
 {
  return gdk_screen_get_setting (gdk_screen_get_default (), name, value);
 }
+
+#define __GDK_EVENTS_C__
+#include "gdkaliasdef.c"
--- a/gdk/gdkfont.c
+++ b/gdk/gdkfont.c
@ -27,10 +27,10 @@
 #undef GDK_DISABLE_DEPRECATED

 #include <config.h>
-#include "gdkalias.h"
 #include "gdkdisplay.h"
 #include "gdkfont.h"
 #include "gdkinternals.h"
+#include "gdkalias.h"

 GType
 gdk_font_get_type (void)
@ -355,4 +355,5 @@ gdk_font_load (const gchar *font_name)
   return gdk_font_load_for_display (gdk_display_get_default(), font_name);
 }

-
+#define __GDK_FONT_C__
+#include "gdkaliasdef.c"
--- a/gdk/gdkgc.c
+++ b/gdk/gdkgc.c
@ -27,10 +27,10 @@
 #include <config.h>
 #include <string.h>

-#include "gdkalias.h"
 #include "gdkgc.h"
 #include "gdkrgb.h"
 #include "gdkprivate.h"
+#include "gdkalias.h"

 static void gdk_gc_class_init (GObjectClass *class);
 static void gdk_gc_finalize   (GObject      *object);
@ -723,3 +723,6 @@ gdk_gc_set_rgb_bg_color (GdkGC          *gc,
  gdk_rgb_find_color (cmap, &tmp_color);
  gdk_gc_set_background (gc, &tmp_color);
 }
+
+#define __GDK_GC_C__
+#include "gdkaliasdef.c"
--- a/gdk/gdkglobals.c
+++ b/gdk/gdkglobals.c
@ -28,7 +28,6 @@

 #include <stdio.h>

-#include "gdkalias.h"
 #include "gdktypes.h"
 #include "gdkprivate.h"

--- a/gdk/gdkimage.c
+++ b/gdk/gdkimage.c
@ -28,11 +28,11 @@
 #include <stdlib.h>
 #include <sys/types.h>

-#include "gdkalias.h"
 #include "gdk.h"		/* For gdk_flush() */
 #include "gdkimage.h"
 #include "gdkprivate.h"
 #include "gdkinternals.h"	/* For scratch_image code */
+#include "gdkalias.h"

 /**
 * gdk_image_ref:
@ -423,3 +423,6 @@ gdk_image_new (GdkImageType  type,
  return _gdk_image_new_for_depth (gdk_visual_get_screen (visual), type,
 				   visual, width, height, -1);
 }
+
+#define __GDK_IMAGE_C__
+#include "gdkaliasdef.c"
--- a/gdk/gdkkeynames.c
+++ b/gdk/gdkkeynames.c
@ -29,9 +29,9 @@
 #include <stdlib.h>
 #include <string.h>

-#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"
--- a/gdk/gdkkeys.c
+++ b/gdk/gdkkeys.c
@ -26,9 +26,9 @@

 #include <config.h>

-#include "gdkalias.h"
 #include "gdkdisplay.h"
 #include "gdkkeys.h"
+#include "gdkalias.h"

 enum {
  DIRECTION_CHANGED,
@ -313,3 +313,6 @@ gdk_keymap_get_default (void)
 {
  return gdk_keymap_get_for_display (gdk_display_get_default ());
 }
+
+#define __GDK_KEYS_C__
+#include "gdkaliasdef.c"
--- a/gdk/gdkkeyuni.c
+++ b/gdk/gdkkeyuni.c
@ -1,6 +1,6 @@
 #include <config.h>
-#include "gdkalias.h"
 #include "gdk.h"
+#include "gdkalias.h"

 /* Thanks to Markus G. Kuhn <mkuhn@acm.org> for the ksysym<->Unicode
 * mapping functions, from the xterm sources.
@ -1669,3 +1669,6 @@ gdk_unicode_to_keyval (guint32 wc)
   */
  return wc | 0x01000000;
 }
+
+#define __GDK_KEYUNI_C__
+#include "gdkaliasdef.c"
--- a/gdk/gdkpango.c
+++ b/gdk/gdkpango.c
@ -19,13 +19,13 @@

 #include <config.h>
 #include <math.h>
-#include "gdkalias.h"
 #include "gdkcolor.h"
 #include "gdkgc.h"
 #include "gdkpango.h"
 #include "gdkrgb.h"
 #include "gdkprivate.h"
 #include "gdkscreen.h"
+#include "gdkalias.h"

 /* This is for P_() ... a bit non-kosher, but works fine */
 #include "gtk/gtkintl.h"
@ -1418,3 +1418,6 @@ gdk_pango_context_get (void)
 {
  return gdk_pango_context_get_for_screen (gdk_screen_get_default ());
 }
+
+#define __GDK_PANGO_C__
+#include "gdkaliasdef.c"
--- a/gdk/gdkpixbuf-drawable.c
+++ b/gdk/gdkpixbuf-drawable.c
@ -25,7 +25,6 @@
 #include <config.h>
 #include <stdio.h>
 #include <string.h>
-#include "gdkalias.h"
 #include "gdkcolor.h"
 #include "gdkimage.h"
 #include "gdkvisual.h"
@ -34,6 +33,7 @@
 #include "gdkpixmap.h"
 #include "gdk-pixbuf-private.h"
 #include "gdkinternals.h"
+#include "gdkalias.h"

 /* Some convenient names
 */
@ -1412,3 +1412,6 @@ gdk_pixbuf_get_from_image (GdkPixbuf   *dest,
  
  return dest;
 }
+
+#define __GDK_PIXBUF_DRAWABLE_C__
+#include "gdkaliasdef.c"
--- a/gdk/gdkpixbuf-render.c
+++ b/gdk/gdkpixbuf-render.c
@ -21,12 +21,12 @@
 */

 #include <config.h>
-#include "gdkalias.h"
 #include <gdk/gdk.h>
 #include "gdk-pixbuf-private.h"
 #include "gdkpixbuf.h"
 #include "gdkscreen.h"
 #include "gdkinternals.h"
+#include "gdkalias.h"



@ -328,3 +328,6 @@ gdk_pixbuf_render_pixmap_and_mask_for_colormap (GdkPixbuf   *pixbuf,
 	*mask_return = NULL;
    }
 }
+
+#define __GDK_PIXBUF_RENDER_C__
+#include "gdkaliasdef.c"
--- a/gdk/gdkpixmap.c
+++ b/gdk/gdkpixmap.c
@ -25,11 +25,11 @@
 */

 #include <config.h>
-#include "gdkalias.h"
 #include "gdkpixmap.h"
 #include "gdkinternals.h"
 #include "gdkpixbuf.h"
 #include "gdkscreen.h"
+#include "gdkalias.h"

 static GdkGC *gdk_pixmap_create_gc      (GdkDrawable     *drawable,
                                         GdkGCValues     *values,
@ -683,3 +683,6 @@ gdk_pixmap_real_get_screen (GdkDrawable *drawable)
 {
    return gdk_drawable_get_screen (GDK_PIXMAP_OBJECT (drawable)->impl);
 }
+
+#define __GDK_PIXMAP_C__
+#include "gdkaliasdef.c"
--- a/gdk/gdkpolyreg-generic.c
+++ b/gdk/gdkpolyreg-generic.c
@ -47,10 +47,10 @@ SOFTWARE.
 #define SMALL_COORDINATE -LARGE_COORDINATE

 #include <config.h>
-#include "gdkalias.h"
 #include <gdkregion.h>
 #include "gdkregion-generic.h"
 #include "gdkpoly-generic.h"
+#include "gdkalias.h"

 /*
 *     InsertEdgeInET
@ -618,3 +618,6 @@ gdk_region_polygon(GdkPoint *Pts, gint Count, GdkFillRule rule)
    g_free (pETEs);
    return(region);
 }
+
+#define __GDK_POLYREG_GENERIC_C__
+#include "gdkaliasdef.c"
--- a/gdk/gdkrectangle.c
+++ b/gdk/gdkrectangle.c
@ -25,8 +25,8 @@
 */

 #include <config.h>
-#include "gdkalias.h"
 #include <gdk/gdk.h>
+#include "gdkalias.h"

 void
 gdk_rectangle_union (GdkRectangle *src1,
@ -105,3 +105,6 @@ gdk_rectangle_get_type (void)
  return our_type;
 }

+
+#define __GDK_RECTANGLE_C__
+#include "gdkaliasdef.c"
--- a/gdk/gdkregion-generic.c
+++ b/gdk/gdkregion-generic.c
@ -71,9 +71,9 @@ SOFTWARE.
 #include <config.h>
 #include <stdlib.h>
 #include <string.h>
-#include "gdkalias.h"
 #include <gdkregion.h>
 #include "gdkregion-generic.h"
+#include "gdkalias.h"

 #ifdef DEBUG
 #include <stdio.h>
@ -1776,3 +1776,6 @@ gdk_region_spans_intersect_foreach (GdkRegion  *region,
      pbox++;
    }
 }
+
+#define __GDK_REGION_GENERIC_C__
+#include "gdkaliasdef.c"
--- a/gdk/gdkrgb.c
+++ b/gdk/gdkrgb.c
@ -36,12 +36,12 @@

 #define ENABLE_GRAYSCALE

-#include "gdkalias.h"
 #include "gdkprivate.h"
 #include "gdkinternals.h"	/* _gdk_windowing_get_bits_for_depth() */

 #include "gdkrgb.h"
 #include "gdkscreen.h"
+#include "gdkalias.h"
 #include <glib/gprintf.h>

 typedef struct _GdkRgbInfo     GdkRgbInfo;
@ -3695,3 +3695,6 @@ gdk_rgb_get_visual (void)
 {
  return gdk_screen_get_rgb_visual (gdk_screen_get_default ());
 }
+
+#define __GDK_RGB_C__
+#include "gdkaliasdef.c"
--- a/gdk/gdkscreen.c
+++ b/gdk/gdkscreen.c
@ -22,11 +22,11 @@
 */

 #include <config.h>
-#include "gdkalias.h"
 #include "gdk.h"		/* For gdk_rectangle_intersect() */
 #include "gdkcolor.h"
 #include "gdkwindow.h"
 #include "gdkscreen.h"
+#include "gdkalias.h"

 static void gdk_screen_class_init  (GdkScreenClass *klass);
 static void gdk_screen_dispose     (GObject        *object);
@ -316,3 +316,6 @@ gdk_screen_height_mm (void)
 {
  return gdk_screen_get_height_mm (gdk_screen_get_default ());
 }
+
+#define __GDK_SCREEN_C__
+#include "gdkaliasdef.c"
--- a/gdk/gdkselection.c
+++ b/gdk/gdkselection.c
@ -1,8 +1,8 @@
 #include <config.h>
-#include "gdkalias.h"
 #include "gdkproperty.h"
 #include "gdkdisplay.h"
 #include "gdkselection.h"
+#include "gdkalias.h"

 gboolean
 gdk_selection_owner_set (GdkWindow *owner,
@ -109,3 +109,5 @@ gdk_utf8_to_compound_text (const gchar *str,
 						ctext, length);
 }

+#define __GDK_SELECTION_C__
+#include "gdkaliasdef.c"
--- a/gdk/gdkvisual.c
+++ b/gdk/gdkvisual.c
@ -22,9 +22,9 @@
 */

 #include <config.h>
-#include "gdkalias.h"
 #include "gdkvisual.h"
 #include "gdkscreen.h"
+#include "gdkalias.h"

 /**
 * gdk_list_visuals:
@ -59,3 +59,6 @@ gdk_visual_get_system (void)
 {
  return gdk_screen_get_system_visual (gdk_screen_get_default());
 }
+
+#define __GDK_VISUAL_C__
+#include "gdkaliasdef.c"
--- a/gdk/gdkwindow.c
+++ b/gdk/gdkwindow.c
@ -25,7 +25,6 @@
 */

 #include <config.h>
-#include "gdkalias.h"
 #include "gdkwindow.h"
 #include "gdkinternals.h"
 #include "gdk.h"		/* For gdk_rectangle_union() */
@ -33,6 +32,7 @@
 #include "gdkdrawable.h"
 #include "gdkpixmap.h"
 #include "gdkscreen.h"
+#include "gdkalias.h"

 #define USE_BACKING_STORE	/* Appears to work on Win32, too, now. */

@ -2883,3 +2883,5 @@ gdk_window_foreign_new (GdkNativeWindow anid)
  return gdk_window_foreign_new_for_display (gdk_display_get_default (), anid);
 }

+#define __GDK_WINDOW_C__
+#include "gdkaliasdef.c"
--- a/gdk/makegdkalias.pl
+++ b/gdk/makegdkalias.pl
@ -1,5 +1,12 @@
 #!/usr/bin/perl -w

+my $do_def = 0;
+
+if (($#ARGV >= 0) && ($ARGV[0] eq "-def")) {
+    shift;
+    $do_def = 1;
+}
+
 print <<EOF;
 /* Generated by makegdkalias.pl */

@ -9,39 +16,25 @@ print <<EOF;

 #ifdef G_HAVE_GNUC_VISIBILITY

-#ifdef  GDK_ENABLE_BROKEN
-#define WAS_BROKEN
-#endif
-#define GDK_ENABLE_BROKEN
+EOF

-#ifdef  GDK_MULTIHEAD_SAFE
-#define WAS_MULTIHEAD
-#endif
-#undef GDK_MULTIHEAD_SAVE
+if ($do_def) {
+    print <<EOF
+#undef IN_FILE
+#define IN_FILE defined

-#ifdef  GDK_DISABLE_DEPRECATED
-#define WAS_NO_DEPR
-#endif
-#undef  GDK_DISABLE_DEPRECATED
-
-#ifdef  G_DISABLE_DEPRECATED
-#define WAS_NO_G_DEPR
-#endif
-#undef  G_DISABLE_DEPRECATED
-
-#include "gdk.h"
-
-#ifdef GDK_WINDOWING_X11
-#include "x11/gdkx.h"
-#endif
-#ifdef GDK_WINDOWING_WIN32
-#include "win32/gdkwin32.h"
-#endif
-#ifdef GDK_WINDOWING_FB
-#include "linux-fb/gdkfb.h"
-#endif
+#undef IN_HEADER
+#define IN_HEADER(x) 1

 EOF
+} 
+else { 
+    print <<EOF
+#define IN_FILE(x) 1
+#define IN_HEADER defined
+
+EOF
+}

 my $in_comment = 0;
 my $in_skipped_section = 0;
@ -80,7 +73,7 @@ while (<>) {
      next;
  }

-  if ($_ =~ /^\#ifdef\s+INCLUDE_VARIABLES/)
+  if ($_ =~ /^\#ifdef\s+(INCLUDE_VARIABLES|INCLUDE_INTERNAL_SYMBOLS|ALL_FILES)/)
  {
      $in_skipped_section = 1;
  }
@ -90,7 +83,14 @@ while (<>) {
      next;
  }

-  if ($_ =~ /^\#ifdef\s+G/)
+  if ($_ =~ /^\#ifn?def\s+G/)
+  {
+      print $_;
+      
+      next;
+  }
+
+  if ($_ =~ /^\#if.*(IN_FILE|IN_HEADER)/)
  {
      print $_;
      
@ -112,39 +112,25 @@ while (<>) {
      $attributes = "$attributes $word" unless $word eq "PRIVATE";
  }
      
-  print <<EOF
+  if (!$do_def) {
+    print <<EOF
 extern __typeof ($str) $alias __attribute((visibility("hidden")))$attributes;
-extern __typeof ($str) $str __attribute((alias("$alias"), visibility("default")));
 \#define $str $alias

 EOF
+  }
+  else {
+    print <<EOF
+\#undef $str 
+extern __typeof ($str) $str __attribute((alias("$alias"), visibility("default")));
+
+EOF
+  }
 }

 print <<EOF;

-#ifndef WAS_BROKEN
-#undef  GDK_ENABLE_BROKEN
-#else
-#undef  WAS_BROKEN
-#endif
-
-#ifdef  WAS_MULTIHEAD
-#define GDK_MULTIHEAD_SAFE
-#undef  WAS_MULTIHEAD
-#endif
-
-#ifdef  WAS_NO_DEPR
-#define GDK_DISABLE_DEPRECATED
-#undef  WAS_NO_DEPR
-#endif
-
-#ifdef  WAS_NO_G_DEPR
-#define G_DISABLE_DEPRECATED
-#undef  WAS_NO_G_DEPR
-#endif
-
 #endif /* G_HAVE_GNUC_VISIBILITY */
-
 #endif /* DISABLE_VISIBILITY */
 EOF

--- a/gdk/x11/gdkasync.c
+++ b/gdk/x11/gdkasync.c
@ -48,9 +48,9 @@ in this Software without prior written authorization from The Open Group.
 #include <X11/extensions/XIproto.h>
 #endif
 #include <X11/Xlibint.h>
-#include "gdkalias.h"
 #include "gdkasync.h"
 #include "gdkx.h"
+#include "gdkalias.h"

 typedef struct _ChildInfoChildState ChildInfoChildState;
 typedef struct _ChildInfoState ChildInfoState;
@ -724,3 +724,5 @@ _gdk_x11_get_window_child_info (GdkDisplay       *display,
  return !state.have_error;
 }

+#define __GDK_ASYNC_C__
+#include "gdkaliasdef.c"
--- a/gdk/x11/gdkcolor-x11.c
+++ b/gdk/x11/gdkcolor-x11.c
@ -27,12 +27,12 @@
 #include <config.h>
 #include <time.h>

-#include "gdkalias.h"
 #include "gdkcolor.h"
 #include "gdkinternals.h"
 #include "gdkx.h"
 #include "gdkprivate-x11.h"
 #include "gdkscreen-x11.h"
+#include "gdkalias.h"

 typedef struct _GdkColormapPrivateX11  GdkColormapPrivateX11;

@ -1526,3 +1526,6 @@ gdk_colormap_get_screen (GdkColormap *cmap)

  return  GDK_COLORMAP_PRIVATE_DATA (cmap)->screen;
 }
+
+#define __GDK_COLOR_X11_C__
+#include "gdkaliasdef.c"
--- a/gdk/x11/gdkcursor-x11.c
+++ b/gdk/x11/gdkcursor-x11.c
@ -31,13 +31,13 @@
 #include <X11/Xcursor/Xcursor.h>
 #endif

-#include "gdkalias.h"
 #include "gdkprivate-x11.h"
 #include "gdkcursor.h"
 #include "gdkpixmap-x11.h"
 #include "gdkx.h"
 #include <gdk/gdkpixmap.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
+#include "gdkalias.h"


 /**
@ -605,3 +605,5 @@ gdk_display_get_maximal_cursor_size (GdkDisplay *display,
 		    128, 128, width, height);
 }

+#define __GDK_CURSOR_X11_C__
+#include "gdkaliasdef.c"
--- a/gdk/x11/gdkdisplay-x11.c
+++ b/gdk/x11/gdkdisplay-x11.c
@ -30,7 +30,6 @@
 #include <unistd.h>

 #include <glib.h>
-#include "gdkalias.h"
 #include "gdkx.h"
 #include "gdkdisplay.h"
 #include "gdkdisplay-x11.h"
@ -39,6 +38,7 @@
 #include "gdkinternals.h"
 #include "gdkinputprivate.h"
 #include "xsettings-client.h"
+#include "gdkalias.h"

 #include <X11/Xatom.h>

@ -1203,3 +1203,6 @@ gdk_x11_display_get_user_time (GdkDisplay *display)
 {
  return GDK_DISPLAY_X11 (display)->user_time;
 }
+
+#define __GDK_DISPLAY_X11_C__
+#include "gdkaliasdef.c"
--- a/gdk/x11/gdkdnd-x11.c
+++ b/gdk/x11/gdkdnd-x11.c
@ -29,7 +29,6 @@
 #include <X11/Xatom.h>
 #include <string.h>

-#include "gdkalias.h"
 #include "gdk.h"          /* For gdk_flush() */
 #include "gdkx.h"
 #include "gdkasync.h"
@ -39,6 +38,7 @@
 #include "gdkinternals.h"
 #include "gdkscreen-x11.h"
 #include "gdkdisplay-x11.h"
+#include "gdkalias.h"

 typedef struct _GdkDragContextPrivateX11 GdkDragContextPrivateX11;

@ -3808,3 +3808,6 @@ gdk_drag_drop_succeeded (GdkDragContext *context)

  return !private->drop_failed;
 }
+
+#define __GDK_DND_X11_C__
+#include "gdkaliasdef.c"
--- a/gdk/x11/gdkdrawable-x11.c
+++ b/gdk/x11/gdkdrawable-x11.c
@ -26,7 +26,6 @@

 #include <config.h>

-#include "gdkalias.h"
 #include "gdkx.h"
 #include "gdkregion-generic.h"

@ -51,6 +50,8 @@
 #include "gdkscreen-x11.h"
 #include "gdkdisplay-x11.h"

+#include "gdkalias.h"
+
 static void gdk_x11_draw_rectangle (GdkDrawable    *drawable,
 				    GdkGC          *gc,
 				    gboolean        filled,
@ -1759,3 +1760,6 @@ _gdk_x11_drawable_draw_xft_glyphs (GdkDrawable      *drawable,
      XftDrawGlyphSpec (draw, &color, xft_font, glyphs, n_glyphs);
    }
 }
+
+#define __GDK_DRAWABLE_X11_C__
+#include "gdkaliasdef.c"
--- a/gdk/x11/gdkevents-x11.c
+++ b/gdk/x11/gdkevents-x11.c
@ -26,7 +26,6 @@

 #include <config.h>

-#include "gdkalias.h"
 #include "gdk.h"
 #include "gdkprivate-x11.h"
 #include "gdkinternals.h"
@ -43,6 +42,8 @@

 #include "gdkinputprivate.h"

+#include "gdkalias.h"
+
 #ifdef HAVE_XKB
 #include <X11/XKBlib.h>
 #endif
@ -2933,3 +2934,6 @@ gdk_xsettings_watch_cb (Window   window,
      g_object_unref (gdkwin);
    }
 }
+
+#define __GDK_EVENTS_X11_C__
+#include "gdkaliasdef.c"
--- a/gdk/x11/gdkfont-x11.c
+++ b/gdk/x11/gdkfont-x11.c
@ -31,13 +31,13 @@
 #include <X11/Xos.h>
 #include <locale.h>

-#include "gdkalias.h"
 #include "gdkx.h"
 #include "gdkfont.h"
 #include "gdkprivate-x11.h"
 #include "gdkinternals.h"
 #include "gdkdisplay-x11.h"
 #include "gdkscreen-x11.h"
+#include "gdkalias.h"

 typedef struct _GdkFontPrivateX        GdkFontPrivateX;

@ -840,3 +840,5 @@ gdk_x11_font_get_name (GdkFont *font)
  return private->names->data;
 }
     
+#define __GDK_FONT_X11_C__
+#include "gdkaliasdef.c"
--- a/gdk/x11/gdkgc-x11.c
+++ b/gdk/x11/gdkgc-x11.c
@ -26,11 +26,11 @@

 #include <config.h>

-#include "gdkalias.h"
 #include "gdkgc.h"
 #include "gdkprivate-x11.h"
 #include "gdkregion-generic.h"
 #include "gdkx.h"
+#include "gdkalias.h"

 #include <string.h>

@ -1302,3 +1302,6 @@ _gdk_windowing_gc_get_foreground (GdkGC    *gc,
  else
    g_warning ("No colormap in _gdk_windowing_gc_get_foreground");
 }
+
+#define __GDK_GC_X11_C__
+#include "gdkaliasdef.c"
--- a/gdk/x11/gdkgeometry-x11.c
+++ b/gdk/x11/gdkgeometry-x11.c
@ -130,7 +130,6 @@
 */

 #include <config.h>
-#include "gdkalias.h"
 #include "gdk.h"		/* For gdk_rectangle_intersect */
 #include "gdkprivate-x11.h"
 #include "gdkx.h"
@ -139,6 +138,7 @@
 #include "gdkscreen-x11.h"
 #include "gdkdisplay-x11.h"
 #include "gdkwindow-x11.h"
+#include "gdkalias.h"

 typedef struct _GdkWindowQueueItem GdkWindowQueueItem;
 typedef struct _GdkWindowParentPos GdkWindowParentPos;
@ -1102,3 +1102,6 @@ gdk_window_clip_changed (GdkWindow *window, GdkRectangle *old_clip, GdkRectangle
  gdk_region_destroy (new_clip_region);
  gdk_region_destroy (old_clip_region);
 }
+
+#define __GDK_GEOMETRY_X11_C__
+#include "gdkaliasdef.c"
--- a/gdk/x11/gdkglobals-x11.c
+++ b/gdk/x11/gdkglobals-x11.c
@ -27,7 +27,6 @@
 #include <config.h>
 #include <stdio.h>

-#include "gdkalias.h"
 #include "gdktypes.h"
 #include "gdkprivate-x11.h"

--- a/gdk/x11/gdkim-x11.c
+++ b/gdk/x11/gdkim-x11.c
@ -30,13 +30,13 @@
 #include <stdlib.h>
 #include <string.h>

-#include "gdkalias.h"
 #include "gdkx.h"
 #include "gdk.h"		/* For gdk_flush() */
 #include "gdkx.h"
 #include "gdkpixmap.h"
 #include "gdkinternals.h"
 #include "gdkdisplay-x11.h"
+#include "gdkalias.h"


 /* If this variable is FALSE, it indicates that we should
@ -251,3 +251,6 @@ gdk_mbstowcs (GdkWChar *dest, const gchar *src, gint dest_max)
      return i;
    }
 }
+
+#define __GDK_IM_X11_C__
+#include "gdkaliasdef.c"
--- a/gdk/x11/gdkimage-x11.c
+++ b/gdk/x11/gdkimage-x11.c
@ -47,7 +47,6 @@

 #include <errno.h>

-#include "gdkalias.h"
 #include "gdk.h"		/* For gdk_error_trap_* / gdk_flush_* */
 #include "gdkx.h"
 #include "gdkimage.h"
@ -55,6 +54,7 @@
 #include "gdkprivate-x11.h"
 #include "gdkdisplay-x11.h"
 #include "gdkscreen-x11.h"
+#include "gdkalias.h"

 typedef struct _GdkImagePrivateX11     GdkImagePrivateX11;

@ -840,3 +840,6 @@ _gdk_windowing_get_bits_for_depth (GdkDisplay *display,
  return -1;
 }

+
+#define __GDK_IMAGE_X11_C__
+#include "gdkaliasdef.c"
--- a/gdk/x11/gdkinput-none.c
+++ b/gdk/x11/gdkinput-none.c
@ -18,9 +18,9 @@
 */

 #include <config.h>
-#include "gdkalias.h"
 #include "gdkinputprivate.h"
 #include "gdkdisplay-x11.h"
+#include "gdkalias.h"

 /*
 * Modified by the GTK+ Team and others 1997-2000.  See the AUTHORS
@ -127,3 +127,5 @@ gdk_device_set_mode (GdkDevice   *device,
  return FALSE;
 }

+#define __GDK_INPUT_X11_C__
+#include "gdkaliasdef.c"
--- a/gdk/x11/gdkinput-x11.c
+++ b/gdk/x11/gdkinput-x11.c
@ -25,12 +25,12 @@
 */

 #include <config.h>
-#include "gdkalias.h"
 #include "gdkinputprivate.h"
 #include "gdkinternals.h"
 #include "gdkx.h"
 #include "gdk.h"		/* For gdk_error_trap_push()/pop() */
 #include "gdkdisplay-x11.h"
+#include "gdkalias.h"

 #include <string.h>

@ -833,3 +833,6 @@ gdk_device_get_state (GdkDevice       *device,
      XFreeDeviceState (state);
    }
 }
+
+#define __GDK_INPUT_X11_C__
+#include "gdkaliasdef.c"
--- a/gdk/x11/gdkinput-xfree.c
+++ b/gdk/x11/gdkinput-xfree.c
@ -18,9 +18,9 @@
 */

 #include <config.h>
-#include "gdkalias.h"
 #include "gdkinputprivate.h"
 #include "gdkdisplay-x11.h"
+#include "gdkalias.h"

 /*
 * Modified by the GTK+ Team and others 1997-2000.  See the AUTHORS
--- a/gdk/x11/gdkinput.c
+++ b/gdk/x11/gdkinput.c
@ -30,13 +30,13 @@
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>

-#include "gdkalias.h"
 #include "gdkx.h"
 #include "gdkinput.h"
 #include "gdkprivate.h"
 #include "gdkinputprivate.h"
 #include "gdkscreen-x11.h"
 #include "gdkdisplay-x11.h"
+#include "gdkalias.h"

 static GdkDeviceAxis gdk_input_core_axes[] = {
  { GDK_AXIS_X, 0, 0 },
@ -445,3 +445,6 @@ gdk_device_get_axis (GdkDevice  *device,
  
  return FALSE;
 }
+
+#define __GDK_INPUT_C__
+#include "gdkaliasdef.c"
--- a/gdk/x11/gdkkeys-x11.c
+++ b/gdk/x11/gdkkeys-x11.c
@ -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"
--- a/gdk/x11/gdkmain-x11.c
+++ b/gdk/x11/gdkmain-x11.c
@ -41,7 +41,6 @@
 #include <X11/XKBlib.h>
 #endif

-#include "gdkalias.h"
 #include "gdk.h"

 #include "gdkx.h"
@ -50,6 +49,7 @@
 #include "gdkintl.h"
 #include "gdkregion-generic.h"
 #include "gdkinputprivate.h"
+#include "gdkalias.h"

 typedef struct _GdkPredicate  GdkPredicate;
 typedef struct _GdkErrorTrap  GdkErrorTrap;
@ -797,4 +797,5 @@ gdk_x11_get_default_xdisplay (void)
  return GDK_DISPLAY_XDISPLAY (gdk_display_get_default ());
 }

-
+#define __GDK_MAIN_X11_C__
+#include "gdkaliasdef.c"
--- a/gdk/x11/gdkpango-x11.c
+++ b/gdk/x11/gdkpango-x11.c
@ -20,12 +20,12 @@
 #include <config.h>
 #include <stdlib.h>

-#include "gdkalias.h"
 #include "gdkx.h"
 #include "gdkdisplay-x11.h"
 #include "gdkpango.h"
 #include <pango/pangoxft.h>
 #include <pango/pangoxft-render.h>
+#include "gdkalias.h"

 #include <math.h>

@ -170,3 +170,5 @@ gdk_pango_context_get_for_screen (GdkScreen *screen)
  return context;
 }

+#define __GDK_PANGO_X11_C__
+#include "gdkaliasdef.c"
--- a/gdk/x11/gdkpixmap-x11.c
+++ b/gdk/x11/gdkpixmap-x11.c
@ -32,7 +32,6 @@
 #include <unistd.h>
 #include <X11/Xlib.h>

-#include "gdkalias.h"
 #include "gdkx.h"

 #include "gdkpixmap-x11.h"
@ -41,6 +40,7 @@
 #include "gdkdisplay-x11.h"

 #include <gdk/gdkinternals.h>
+#include "gdkalias.h"

 typedef struct
 {
@ -436,3 +436,6 @@ gdk_pixmap_lookup_for_display (GdkDisplay *display, GdkNativeWindow anid)
  g_return_val_if_fail (GDK_IS_DISPLAY (display), NULL);
  return (GdkPixmap*) gdk_xid_table_lookup_for_display (display, anid);
 }
+
+#define __GDK_PIXMAP_X11_C__
+#include  "gdkaliasdef.c"
--- a/gdk/x11/gdkproperty-x11.c
+++ b/gdk/x11/gdkproperty-x11.c
@ -29,7 +29,6 @@
 #include <X11/Xatom.h>
 #include <string.h>

-#include "gdkalias.h"
 #include "gdk.h"          /* For gdk_error_trap_push/pop() */
 #include "gdkx.h"
 #include "gdkproperty.h"
@ -38,6 +37,7 @@
 #include "gdkdisplay-x11.h"
 #include "gdkscreen-x11.h"
 #include "gdkselection.h"	/* only from predefined atom */
+#include "gdkalias.h"

 static GPtrArray *virtual_atom_array;
 static GHashTable *virtual_atom_hash;
@ -684,3 +684,6 @@ gdk_property_delete (GdkWindow *window,
 		   gdk_x11_atom_to_xatom_for_display (GDK_WINDOW_DISPLAY (window),
 						      property));
 }
+
+#define __GDK_PROPERTY_X11_C__
+#include "gdkaliasdef.c"
--- a/gdk/x11/gdkscreen-x11.c
+++ b/gdk/x11/gdkscreen-x11.c
@ -27,12 +27,12 @@
 #include <string.h>

 #include <glib.h>
-#include "gdkalias.h"
 #include "gdkscreen.h"
 #include "gdkscreen-x11.h"
 #include "gdkdisplay.h"
 #include "gdkdisplay-x11.h"
 #include "gdkx.h"
+#include "gdkalias.h"

 #ifdef HAVE_SOLARIS_XINERAMA
 #include <X11/extensions/xinerama.h>
@ -710,3 +710,6 @@ gdk_screen_make_display_name (GdkScreen *screen)
  return _gdk_windowing_substitute_screen_number (old_display, 
 						  gdk_screen_get_number (screen));
 }
+
+#define __GDK_SCREEN_X11_C__
+#include "gdkaliasdef.c"
--- a/gdk/x11/gdkselection-x11.c
+++ b/gdk/x11/gdkselection-x11.c
@ -29,13 +29,13 @@
 #include <X11/Xatom.h>
 #include <string.h>

-#include "gdkalias.h"
 #include "gdkx.h"
 #include "gdkproperty.h"
 #include "gdkselection.h"
 #include "gdkprivate.h"
 #include "gdkprivate-x11.h"
 #include "gdkdisplay-x11.h"
+#include "gdkalias.h"

 typedef struct _OwnerInfo OwnerInfo;

@ -880,3 +880,6 @@ void gdk_free_compound_text (guchar *ctext)
  if (ctext)
    XFree (ctext);
 }
+
+#define __GDK_SELECTION_X11_C__
+#include "gdkaliasdef.c"
--- a/gdk/x11/gdkspawn-x11.c
+++ b/gdk/x11/gdkspawn-x11.c
@ -22,11 +22,11 @@
 #include <config.h>
 #include <string.h>

-#include "gdkalias.h"
 #include "gdkspawn.h"

 #include <glib.h>
 #include <gdk/gdk.h>
+#include "gdkalias.h"

 extern char **environ;

@ -248,3 +248,6 @@ gdk_spawn_command_line_on_screen (GdkScreen    *screen,

  return retval;
 }
+
+#define __GDK_SPAWN_X11_C__
+#include "gdkaliasdef.c"
--- a/gdk/x11/gdkvisual-x11.c
+++ b/gdk/x11/gdkvisual-x11.c
@ -28,11 +28,12 @@
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>

-#include "gdkalias.h"
+#include "gdkx.h"
 #include "gdkvisual.h"
 #include "gdkprivate-x11.h"
 #include "gdkscreen-x11.h"
 #include "gdkinternals.h"
+#include "gdkalias.h"

 struct _GdkVisualClass
 {
@ -665,3 +666,6 @@ gdk_visual_get_screen (GdkVisual *visual)

  return  ((GdkVisualPrivate*) visual)->screen;
 }
+
+#define __GDK_VISUAL_X11_C__
+#include "gdkaliasdef.c"
--- a/gdk/x11/gdkwindow-x11.c
+++ b/gdk/x11/gdkwindow-x11.c
@ -32,7 +32,6 @@
 #include <netinet/in.h>
 #include <unistd.h>

-#include "gdkalias.h"
 #include "gdk.h"

 #include "gdkwindow.h"
@ -44,6 +43,7 @@
 #include "gdkinternals.h"
 #include "MwmUtil.h"
 #include "gdkwindow-x11.h"
+#include "gdkalias.h"

 #include <stdlib.h>
 #include <stdio.h>
@ -5899,3 +5899,6 @@ gdk_window_configure_finished (GdkWindow *window)
    }
 #endif
 }
+
+#define __GDK_WINDOW_X11_C__
+#include "gdkaliasdef.c"
--- a/gdk/x11/gdkxid.c
+++ b/gdk/x11/gdkxid.c
@ -25,9 +25,10 @@
 */

 #include <config.h>
-#include "gdkalias.h"
+#include "gdkx.h"
 #include "gdkprivate-x11.h"
 #include "gdkdisplay-x11.h"
+#include "gdkalias.h"
 #include <stdio.h>

 static guint     gdk_xid_hash  (XID *xid);
@ -124,3 +125,6 @@ gdk_xid_equal (XID *a,
 {
  return (*a == *b);
 }
+
+#define __GDK_XID_C__
+#include "gdkaliasdef.c"