diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2011-05-30 15:41:01 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2011-05-30 15:41:01 +0100 |
| commit | 0f320c5224fe39df44648ac75ecce9e0a01079d0 (patch) | |
| tree | 28cb06af77b377fade1fdc15d5436a9157518167 | |
| parent | f91828abb160e44b53a32823516d55d8a5d634bc (diff) | |
Include config.h in generated C files, and regenerate dbus-gmarshal.c
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=37060
Reviewed-by: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
| -rw-r--r-- | dbus/Makefile.am | 3 | ||||
| -rw-r--r-- | dbus/dbus-gmarshal.c | 7 | ||||
| -rw-r--r-- | dbus/examples/statemachine/Makefile.am | 4 | ||||
| -rw-r--r-- | test/core/Makefile.am | 4 |
4 files changed, 13 insertions, 5 deletions
diff --git a/dbus/Makefile.am b/dbus/Makefile.am index b9aa1c2..b79f870 100644 --- a/dbus/Makefile.am +++ b/dbus/Makefile.am @@ -91,7 +91,8 @@ dbus_binding_tool_LDADD= $(builddir)/libdbus-gtool.la $(builddir)/libdbus-glib-1 ## convincing automake/make to do this properly regenerate-built-sources: @GLIB_GENMARSHAL@ --prefix=_dbus_g_marshal dbus-gmarshal.list --header > dbus-gmarshal.h && \ - echo '#include "dbus-gmarshal.h"' > dbus-gmarshal.c && \ + echo '#include <config.h>' > dbus-gmarshal.c && \ + echo '#include "dbus-gmarshal.h"' >> dbus-gmarshal.c && \ @GLIB_GENMARSHAL@ --prefix=_dbus_g_marshal dbus-gmarshal.list --body >> dbus-gmarshal.c diff --git a/dbus/dbus-gmarshal.c b/dbus/dbus-gmarshal.c index 13e98b1..65f13c7 100644 --- a/dbus/dbus-gmarshal.c +++ b/dbus/dbus-gmarshal.c @@ -1,3 +1,4 @@ +#include <config.h> #include "dbus-gmarshal.h" #include <glib-object.h> @@ -22,6 +23,7 @@ #define g_marshal_value_peek_boxed(v) g_value_get_boxed (v) #define g_marshal_value_peek_pointer(v) g_value_get_pointer (v) #define g_marshal_value_peek_object(v) g_value_get_object (v) +#define g_marshal_value_peek_variant(v) g_value_get_variant (v) #else /* !G_ENABLE_DEBUG */ /* WARNING: This code accesses GValues directly, which is UNSUPPORTED API. * Do not access GValues directly in your code. Instead, use the @@ -45,16 +47,17 @@ #define g_marshal_value_peek_boxed(v) (v)->data[0].v_pointer #define g_marshal_value_peek_pointer(v) (v)->data[0].v_pointer #define g_marshal_value_peek_object(v) (v)->data[0].v_pointer +#define g_marshal_value_peek_variant(v) (v)->data[0].v_pointer #endif /* !G_ENABLE_DEBUG */ /* NONE:STRING,STRING,STRING (dbus-gmarshal.list:1) */ void _dbus_g_marshal_VOID__STRING_STRING_STRING (GClosure *closure, - GValue *return_value, + GValue *return_value G_GNUC_UNUSED, guint n_param_values, const GValue *param_values, - gpointer invocation_hint, + gpointer invocation_hint G_GNUC_UNUSED, gpointer marshal_data) { typedef void (*GMarshalFunc_VOID__STRING_STRING_STRING) (gpointer data1, diff --git a/dbus/examples/statemachine/Makefile.am b/dbus/examples/statemachine/Makefile.am index 2377621..a9b6237 100644 --- a/dbus/examples/statemachine/Makefile.am +++ b/dbus/examples/statemachine/Makefile.am @@ -34,7 +34,9 @@ statemachine-glue.h: statemachine.xml $(LIBTOOL) --mode=execute $(DBUS_BINDING_TOOL) --prefix=sm_object --mode=glib-server --output=$@ $< sm-marshal.c: Makefile sm-marshal.list - @GLIB_GENMARSHAL@ --prefix=sm_marshal $(srcdir)/sm-marshal.list --header --body > $@.tmp && mv $@.tmp $@ + echo "#include <config.h>" > $@.tmp + @GLIB_GENMARSHAL@ --prefix=sm_marshal $(srcdir)/sm-marshal.list --header --body >> $@.tmp + mv $@.tmp $@ sm-marshal.h: Makefile sm-marshal.list @GLIB_GENMARSHAL@ --prefix=sm_marshal $(srcdir)/sm-marshal.list --header > $@.tmp && mv $@.tmp $@ diff --git a/test/core/Makefile.am b/test/core/Makefile.am index cdd53ce..164e3d8 100644 --- a/test/core/Makefile.am +++ b/test/core/Makefile.am @@ -99,7 +99,9 @@ test-service-glib-bindings.h: test-service-glib.xml $(top_builddir)/dbus/dbus-bi $(DEBUG) $(DBUS_BINDING_TOOL) --prefix=my_object --mode=glib-client --output=test-service-glib-bindings.h $(srcdir)/test-service-glib.xml my-object-marshal.c: Makefile my-object-marshal.list - @GLIB_GENMARSHAL@ --prefix=my_object_marshal $(srcdir)/my-object-marshal.list --header --body > my-object-marshal.c + echo "#include <config.h>" > $@.tmp + @GLIB_GENMARSHAL@ --prefix=my_object_marshal $(srcdir)/my-object-marshal.list --header --body >> $@.tmp + mv $@.tmp $@ my-object-marshal.h: Makefile my-object-marshal.list @GLIB_GENMARSHAL@ --prefix=my_object_marshal $(srcdir)/my-object-marshal.list --header > my-object-marshal.h |