gmessages: Fix up testing commit to handle fatal masquerading

[platform/upstream/glib.git] / glib / gatomic.c

diff --git a/glib/gatomic.c b/glib/gatomic.c
index 461a8e6..eb2fe46 100644 (file)
--- a/glib/gatomic.c
+++ b/glib/gatomic.c
@@ -523,25 +523,13 @@ _gInterlockedXor (volatile guint *atomic,
 #define InterlockedXor(a,b) _gInterlockedXor(a,b)
 #endif
 
-/* mingw32 does not have MemoryBarrier.
- * MemoryBarrier may be defined as a macro or a function.
- * Just make a failsafe version for ourselves. */
-#ifdef MemoryBarrier
-#define _GMemoryBarrier MemoryBarrier
-#else
-static inline void _GMemoryBarrier (void) {
-  long dummy = 0;
-  InterlockedExchange (&dummy, 1);
-}
-#endif
-
 /*
  * http://msdn.microsoft.com/en-us/library/ms684122(v=vs.85).aspx
  */
 gint
 (g_atomic_int_get) (const volatile gint *atomic)
 {
-  _GMemoryBarrier ();
+  MemoryBarrier ();
   return *atomic;
 }
 
@@ -550,7 +538,7 @@ void
                     gint           newval)
 {
   *atomic = newval;
-  _GMemoryBarrier ();
+  MemoryBarrier ();
 }
 
 void
@@ -607,7 +595,7 @@ gpointer
 {
   const volatile gpointer *ptr = atomic;
 
-  _GMemoryBarrier ();
+  MemoryBarrier ();
   return *ptr;
 }
 
@@ -618,7 +606,7 @@ void
   volatile gpointer *ptr = atomic;
 
   *ptr = newval;
-  _GMemoryBarrier ();
+  MemoryBarrier ();
 }
 
 gboolean
@@ -694,7 +682,7 @@ gsize
 static pthread_mutex_t g_atomic_lock = PTHREAD_MUTEX_INITIALIZER;
 
 gint
-(g_atomic_int_get) (volatile gint *atomic)
+(g_atomic_int_get) (const volatile gint *atomic)
 {
   gint value;
 
@@ -809,9 +797,9 @@ guint
 
 
 gpointer
-(g_atomic_pointer_get) (volatile void *atomic)
+(g_atomic_pointer_get) (const volatile void *atomic)
 {
-  volatile gpointer *ptr = atomic;
+  const volatile gpointer *ptr = atomic;
   gpointer value;
 
   pthread_mutex_lock (&g_atomic_lock);