diff options
| author | Emmanuele Bassi <ebassi@linux.intel.com> | 2010-09-08 11:58:42 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2010-09-08 12:06:49 +0300 |
| commit | 016cecb179de46defe84d674c277add5c2a1bd3f (patch) | |
| tree | 5002d829b9ca15ed1102ce011fe363d36661015b /gobject | |
| parent | 349322622a46cafbda7d4d16c0fa9b245467d720 (diff) | |
| download | glib-016cecb179de46defe84d674c277add5c2a1bd3f.tar.gz | |
Revert hack that broke things badly on Windows
This should fix bug #628952.
Don't include glib/gdatasetprivate.h directly. Especially don't define
GLIB_COMPILATION when doing that, as that causes breakage on Windows
because of the variable dllimport/dllexport stuff in gtypes.h that
checks GLIB_COMPILATION. That macro really should be defined only when
compiling code that goes into the libglib DLL. Otherwise the compiler
thinks that variables that should be imported from libglib are
actually defined in the code being compiled.
Just call g_atomic_pointer_get() as such, don't bother with
G_DATALIST_GET_FLAGS.
Signed-off-by: Tor Lillqvist <tml@iki.fi>
Diffstat (limited to 'gobject')
| -rw-r--r-- | gobject/gobject.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/gobject/gobject.c b/gobject/gobject.c index 19434057c..819333fb3 100644 --- a/gobject/gobject.c +++ b/gobject/gobject.c @@ -26,13 +26,6 @@ #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" #include "gsignal.h" @@ -113,7 +106,7 @@ #define OBJECT_HAS_TOGGLE_REF_FLAG 0x1 #define OBJECT_HAS_TOGGLE_REF(object) \ - ((G_DATALIST_GET_FLAGS (&(object)->qdata) & OBJECT_HAS_TOGGLE_REF_FLAG) != 0) + ((g_datalist_get_flags (&(object)->qdata) & OBJECT_HAS_TOGGLE_REF_FLAG) != 0) #define OBJECT_FLOATING_FLAG 0x2 #define CLASS_HAS_PROPS_FLAG 0x1 |