*** ./glib/gatomic.h.ORIG	Mon Jun 24 13:17:06 2013
--- ./glib/gatomic.h	Mon Jun 24 13:30:35 2013
***************
*** 31,37 ****
  G_BEGIN_DECLS
  
  GLIB_AVAILABLE_IN_ALL
! gint                    g_atomic_int_get                      (const volatile gint *atomic);
  GLIB_AVAILABLE_IN_ALL
  void                    g_atomic_int_set                      (volatile gint  *atomic,
                                                                 gint            newval);
--- 31,37 ----
  G_BEGIN_DECLS
  
  GLIB_AVAILABLE_IN_ALL
! gint                    g_atomic_int_get                      (volatile gint *atomic);
  GLIB_AVAILABLE_IN_ALL
  void                    g_atomic_int_set                      (volatile gint  *atomic,
                                                                 gint            newval);
***************
*** 57,63 ****
                                                                 guint           val);
  
  GLIB_AVAILABLE_IN_ALL
! gpointer                g_atomic_pointer_get                  (const volatile void *atomic);
  GLIB_AVAILABLE_IN_ALL
  void                    g_atomic_pointer_set                  (volatile void  *atomic,
                                                                 gpointer        newval);
--- 57,63 ----
                                                                 guint           val);
  
  GLIB_AVAILABLE_IN_ALL
! gpointer                g_atomic_pointer_get                  (volatile void *atomic);
  GLIB_AVAILABLE_IN_ALL
  void                    g_atomic_pointer_set                  (volatile void  *atomic,
                                                                 gpointer        newval);
***************
*** 83,88 ****
--- 83,93 ----
                                                                 gint            val);
  
  G_END_DECLS
+ 
+ #ifdef _AIX
+ #undef G_ATOMIC_LOCK_FREE
+ #undef __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4
+ #endif
  
  #if defined(G_ATOMIC_LOCK_FREE) && defined(__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4)