Hack to include glib/gdatasetprivate.h directly

The gdatasetprivate.h header includes gatomic.h directly. It all works
well in GLib, but inside GObject it will trigger the single inclusion
guard.

Since this is a private header, and it's kind of a special case, one way
to fix it is to declare GLIB_COMPILATION around it and fool the single
inclusion guard in gatomic.h into thinking we're compiling GLib and not
GObject.

diff --git a/gobject/gobject.c b/gobject/gobject.c
index f9280c24dfa5f09f2cfcf267e593cfad0c18df5c..19434057cf4fe53386d63925f7cd19ace645d678 100644 (file)
--- a/gobject/gobject.c
+++ b/gobject/gobject.c
@@ -26,7 +26,12 @@
 #include <string.h>
 #include <signal.h>
 
+/* fool the single inclusion guard in gatomic.h, which is directly
+ * included by gdatasetprivate.h
+ */
+#define GLIB_COMPILATION
 #include "glib/gdatasetprivate.h"
+#undef GLIB_COMPILATION
 
 #include "gobject.h"
 #include "gvaluecollector.h"