diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2005-03-16 03:17:27 +0000 |
|---|---|---|
| committer | Matthias Clasen <matthiasc@src.gnome.org> | 2005-03-16 03:17:27 +0000 |
| commit | 2a2d769d423ad79f606b995f9016dc59e72d9d8c (patch) | |
| tree | 1c513437b23445551532702651075f37a93c6db0 /gdk/x11/gdkproperty-x11.c | |
| parent | 34bfd7127948fd7608d53e90d2404caf21d9478e (diff) | |
| download | gtk+-2a2d769d423ad79f606b995f9016dc59e72d9d8c.tar.gz | |
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.
Diffstat (limited to 'gdk/x11/gdkproperty-x11.c')
| -rw-r--r-- | gdk/x11/gdkproperty-x11.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/gdk/x11/gdkproperty-x11.c b/gdk/x11/gdkproperty-x11.c index dba6a080e7..4069e018a7 100644 --- 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" |