Revert hack that broke things badly on Windows
authorEmmanuele Bassi <ebassi@linux.intel.com>
Wed, 8 Sep 2010 08:58:42 +0000 (11:58 +0300)
committerTor Lillqvist <tml@iki.fi>
Wed, 8 Sep 2010 09:06:49 +0000 (12:06 +0300)
commit016cecb179de46defe84d674c277add5c2a1bd3f
tree5002d829b9ca15ed1102ce011fe363d36661015b
parent349322622a46cafbda7d4d16c0fa9b245467d720
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>
gobject/gobject.c