[glib] Revert hack that broke things badly on Windows

[Tor Lillqvist <tml src gnome org>]

commit 016cecb179de46defe84d674c277add5c2a1bd3f
Author: Emmanuele Bassi <ebassi linux intel com>
Date:   Wed Sep 8 11:58:42 2010 +0300

    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 |    9 +--------
 1 files changed, 1 insertions(+), 8 deletions(-)
---
diff --git a/gobject/gobject.c b/gobject/gobject.c
index 1943405..819333f 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