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

Revert hack that broke things badly on Windows

Browse Source 
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>
This commit is contained in:
Emmanuele Bassi 2010-09-08 11:58:42 +03:00 committed by Tor Lillqvist
parent 349322622a
commit 016cecb179
1 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gobject/gobject.c
View File

@ -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