rpms/glib2/devel glib-2.7.6-atomic.patch,1.3,1.4

[fedora-cvs-commits at redhat.com]

Author: mclasen

Update of /cvs/dist/rpms/glib2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8647

Modified Files:
	glib-2.7.6-atomic.patch 
Log Message:
Another attempt


glib-2.7.6-atomic.patch:
 gatomic.c    |   18 ++++++++++++++++--
 gatomic.h    |    4 ++--
 glib.symbols |    3 +++
 3 files changed, 21 insertions(+), 4 deletions(-)

Index: glib-2.7.6-atomic.patch
===================================================================
RCS file: /cvs/dist/rpms/glib2/devel/glib-2.7.6-atomic.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- glib-2.7.6-atomic.patch	4 Aug 2005 14:45:07 -0000	1.3
+++ glib-2.7.6-atomic.patch	4 Aug 2005 16:04:50 -0000	1.4
@@ -1,5 +1,5 @@
 --- glib-2.7.6/glib/gatomic.c.atomic	2005-08-04 10:33:14.000000000 -0400
-+++ glib-2.7.6/glib/gatomic.c	2005-08-04 10:43:47.000000000 -0400
++++ glib-2.7.6/glib/gatomic.c	2005-08-04 12:03:44.000000000 -0400
 @@ -464,7 +464,7 @@
    __asm__ __volatile__ ("cs %0, %2, %1"
  			: "+d" (result), "=Q" (*(atomic))
@@ -29,8 +29,8 @@
 +  return g_atomic_int_get (atomic);
 +}
 +
-+gint
-+(g_atomic_pointer_get) (gint *atomic)
++gpointer
++(g_atomic_pointer_get) (gpointer *atomic)
 +{
 +  return g_atomic_pointer_get (atomic);
 +}
@@ -38,18 +38,34 @@
 +
  #define __G_ATOMIC_C__
  #include "galiasdef.c"
---- glib-2.7.6/glib/glib.symbols.atomic	2005-08-04 10:44:24.000000000 -0400
-+++ glib-2.7.6/glib/glib.symbols	2005-08-04 10:44:31.000000000 -0400
-@@ -82,12 +82,10 @@
+--- glib-2.7.6/glib/glib.symbols.atomic	2005-08-04 12:02:45.000000000 -0400
++++ glib-2.7.6/glib/glib.symbols	2005-08-04 12:03:07.000000000 -0400
+@@ -82,10 +82,13 @@
  g_atomic_int_compare_and_exchange
  g_atomic_int_exchange_and_add
  g_atomic_pointer_compare_and_exchange
--#ifdef G_ATOMIC_OP_MEMORY_BARRIER_NEEDED
++#ifdef INCLUDE_INTERNAL_SYMBOLS
++ /* these are not internal, but we don't want to alias them */
  g_atomic_int_get
  g_atomic_pointer_get
  #endif
  #endif
--#endif
++#endif
  
  #if IN_HEADER(__G_BACKTRACE_H__)
  #if IN_FILE(__G_BACKTRACE_C__)
+--- glib-2.7.6/glib/gatomic.h.atomic	2005-08-04 12:03:53.000000000 -0400
++++ glib-2.7.6/glib/gatomic.h	2005-08-04 12:04:19.000000000 -0400
+@@ -45,10 +45,10 @@
+ 						gpointer  oldval, 
+ 						gpointer  newval);
+ 
+-#ifdef G_ATOMIC_OP_MEMORY_BARRIER_NEEDED
+ gint     g_atomic_int_get                      (gint     *atomic);
+ gpointer g_atomic_pointer_get                  (gpointer *atomic);
+-#else /* !G_ATOMIC_OP_MEMORY_BARRIER_NEEDED */
++
++#ifndef G_ATOMIC_OP_MEMORY_BARRIER_NEEDED
+ # define g_atomic_int_get(atomic) (*(atomic))
+ # define g_atomic_pointer_get(atomic) (*(atomic))
+ #endif /* G_ATOMIC_OP_MEMORY_BARRIER_NEEDED */