luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-01-27 06:26:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

gvariant-internal.h: fix the include hack

Browse Source 
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
This commit is contained in:
Dan Winship 2012-11-10 11:13:24 -05:00
parent 468a166711
commit 75d2c1823c
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
glib/gvariant-internal.h
View File

@ -28,9 +28,8 @@
#ifndef __G_VARIANT_INTERNAL_H__ #ifndef __G_VARIANT_INTERNAL_H__
#define __G_VARIANT_INTERNAL_H__ #define __G_VARIANT_INTERNAL_H__
#ifndef GLIB_COMPILATION /* Hack */
#define GLIB_COMPILATION #define __GLIB_H_INSIDE__
#endif
#include <glib/gvarianttype.h> #include <glib/gvarianttype.h>
#include <glib/gtypes.h> #include <glib/gtypes.h>
@ -38,6 +37,8 @@
#include "gvariant-serialiser.h" #include "gvariant-serialiser.h"
#include "gvarianttypeinfo.h" #include "gvarianttypeinfo.h"
#undef __GLIB_H_INSIDE__
gboolean g_variant_format_string_scan (const gchar *string, gboolean g_variant_format_string_scan (const gchar *string,
const gchar *limit, const gchar *limit,
const gchar **endptr); const gchar **endptr);