gvariant-internal.h: fix the include hack

gvariant-internal.h was defining GLIB_COMPILATION so that it could
include individual headers, but this broke tests/gvariant on windows
because setting GLIB_COMPILATION changes the definition of GLIB_VAR,
causing external variables to not be found. Fix this by having it
define __GLIB_H_INSIDE__ instead.

https://bugzilla.gnome.org/show_bug.cgi?id=688109

diff --git a/glib/gvariant-internal.h b/glib/gvariant-internal.h
index 66a080a..8d4a577 100644 (file)
--- a/glib/gvariant-internal.h
+++ b/glib/gvariant-internal.h
@@ -28,9 +28,8 @@
 #ifndef __G_VARIANT_INTERNAL_H__
 #define __G_VARIANT_INTERNAL_H__
 
-#ifndef GLIB_COMPILATION
-#define GLIB_COMPILATION
-#endif
+/* Hack */
+#define __GLIB_H_INSIDE__
 
 #include <glib/gvarianttype.h>
 #include <glib/gtypes.h>
@@ -38,6 +37,8 @@
 #include "gvariant-serialiser.h"
 #include "gvarianttypeinfo.h"
 
+#undef __GLIB_H_INSIDE__
+
 gboolean                        g_variant_format_string_scan            (const gchar          *string,
                                                                          const gchar          *limit,
                                                                          const gchar         **endptr);