summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenjamin Otte <otte@redhat.com>2012-10-05 16:46:36 +0200
committerBenjamin Otte <otte@redhat.com>2012-10-06 15:55:30 -0400
commitdd3c56d783644d2ea597f761fa95047514d10cb8 (patch)
treeb8bd62f31faebee9cb60835695aa11c20a4e8acf
parent1a1361c4b335299384031fa2daee4215a145f07e (diff)
downloadgtk+-dd3c56d783644d2ea597f761fa95047514d10cb8.tar.gz
gdk: Ignore headers for declared functions
-rw-r--r--gdk/Makefile.am3
-rw-r--r--gdk/gdkdeprecated.c2
-rw-r--r--gdk/gdkkeyuni.c1
-rw-r--r--gdk/gdkscreen.c1
4 files changed, 6 insertions, 1 deletions
diff --git a/gdk/Makefile.am b/gdk/Makefile.am
index b6b74ce1e8..8c811b589a 100644
--- a/gdk/Makefile.am
+++ b/gdk/Makefile.am
@@ -341,7 +341,8 @@ gdkmarshalers.h: @REBUILD@ gdkmarshalers.list
&& mv gdkmarshalers-h.tmp gdkmarshalers.h \
|| ( rm -f gdkmarshalers-h.tmp && exit 1)
gdkmarshalers.c: @REBUILD@ gdkmarshalers.list
- $(AM_V_GEN) $(GLIB_GENMARSHAL) --prefix=_gdk_marshal $(srcdir)/gdkmarshalers.list --body > gdkmarshalers-c.tmp \
+ $(AM_V_GEN) (echo "#include \"gdkmarshalers.h\""; \
+ $(GLIB_GENMARSHAL) --prefix=_gdk_marshal $(srcdir)/gdkmarshalers.list --body) > gdkmarshalers-c.tmp \
&& mv gdkmarshalers-c.tmp gdkmarshalers.c \
|| ( rm -f gdkmarshalers-c.tmp && exit 1 )
diff --git a/gdk/gdkdeprecated.c b/gdk/gdkdeprecated.c
index ddb3c86be4..c7351438cf 100644
--- a/gdk/gdkdeprecated.c
+++ b/gdk/gdkdeprecated.c
@@ -24,6 +24,8 @@
#include "config.h"
#include "gdkdisplay.h"
+#include "gdkmain.h"
+#include "gdkwindow.h"
/**
* gdk_pointer_ungrab:
diff --git a/gdk/gdkkeyuni.c b/gdk/gdkkeyuni.c
index c951ad8d82..a8c1c3472b 100644
--- a/gdk/gdkkeyuni.c
+++ b/gdk/gdkkeyuni.c
@@ -24,6 +24,7 @@
#include "config.h"
+#include "gdkkeys.h"
#include "gdktypes.h"
diff --git a/gdk/gdkscreen.c b/gdk/gdkscreen.c
index 94cd89b2b1..93fef6d06a 100644
--- a/gdk/gdkscreen.c
+++ b/gdk/gdkscreen.c
@@ -21,6 +21,7 @@
#include "config.h"
+#include "gdkinternals.h"
#include "gdkscreenprivate.h"
#include "gdkrectangle.h"
#include "gdkwindow.h"