openSUSE Build Service

Overview Repositories Revisions Requests Users Attributes Meta

File glib-cast.patch of Package glib2 (Revision 94c740becb99dc17c3d16302c3905964)

Currently displaying revision 94c740becb99dc17c3d16302c3905964 , Show latest

=== modified file 'gio/gioenumtypes.c.template'
--- gio/gioenumtypes.c.template	2008-01-23 17:58:33 +0000
+++ gio/gioenumtypes.c.template	2008-01-23 17:59:20 +0000
@@ -12,7 +12,7 @@
 GType
 @enum_name@_get_type (void)
 {
-  static volatile gsize g_define_type_id__volatile = 0;
+  static volatile gpointer g_define_type_id__volatile = 0;
 
   if (g_once_init_enter (&g_define_type_id__volatile))
     {
@@ -28,10 +28,10 @@
       };
       GType g_define_type_id =
         g_@type@_register_static (g_intern_static_string ("@EnumName@"), values);
-      g_once_init_leave (&g_define_type_id__volatile, g_define_type_id);
+      g_once_init_leave (&g_define_type_id__volatile, (gpointer) g_define_type_id);
     }
 
-  return g_define_type_id__volatile;
+  return (GType) g_define_type_id__volatile;
 }
 
 /*** END value-tail ***/

=== modified file 'gio/gvfs.c'
--- gio/gvfs.c	2008-01-23 17:58:33 +0000
+++ gio/gvfs.c	2008-01-23 17:59:20 +0000
@@ -269,8 +269,8 @@
 {
   static gsize vfs = 0;
 
-  if (g_once_init_enter (&vfs))
-    g_once_init_leave (&vfs, (gsize)_g_local_vfs_new ());
+  if (g_once_init_enter ((gpointer) &vfs))
+    g_once_init_leave ((gpointer) &vfs, (gpointer) _g_local_vfs_new ());
 
   return G_VFS (vfs);
 }

=== modified file 'glib/garray.h'
--- glib/garray.h	2008-01-23 17:58:33 +0000
+++ glib/garray.h	2008-01-23 17:59:17 +0000
@@ -61,7 +61,7 @@
 #define g_array_append_val(a,v)	  g_array_append_vals (a, &(v), 1)
 #define g_array_prepend_val(a,v)  g_array_prepend_vals (a, &(v), 1)
 #define g_array_insert_val(a,i,v) g_array_insert_vals (a, i, &(v), 1)
-#define g_array_index(a,t,i)      (((t*) (void *) (a)->data) [(i)])
+#define g_array_index(a,t,i)      (((t*) ((void *) ((a)->data))) [(i)])
 
 GArray* g_array_new               (gboolean          zero_terminated,
 				   gboolean          clear_,

=== modified file 'glib/gthread.c'
--- glib/gthread.c	2008-01-23 17:58:33 +0000
+++ glib/gthread.c	2008-01-23 17:59:17 +0000
@@ -200,7 +200,7 @@
 }
 
 gboolean
-g_once_init_enter_impl (volatile gsize *value_location)
+g_once_init_enter_impl (volatile gpointer *value_location)
 {
   gboolean need_init = FALSE;
   g_mutex_lock (g_once_mutex);
@@ -221,8 +221,8 @@
 }
 
 void
-g_once_init_leave (volatile gsize *value_location,
-                   gsize           initialization_value)
+g_once_init_leave (volatile gpointer *value_location,
+                   gpointer           initialization_value)
 {
   g_return_if_fail (g_atomic_pointer_get ((void**) value_location) == NULL);
   g_return_if_fail (initialization_value != 0);

=== modified file 'glib/gthread.h'
--- glib/gthread.h	2008-01-23 17:58:33 +0000
+++ glib/gthread.h	2008-01-23 17:59:17 +0000
@@ -324,13 +324,13 @@
 #endif /* G_ATOMIC_OP_MEMORY_BARRIER_NEEDED */
 
 /* initialize-once guards, keyed by value_location */
-G_INLINE_FUNC gboolean  g_once_init_enter       (volatile gsize *value_location);
-gboolean                g_once_init_enter_impl  (volatile gsize *value_location);
-void                    g_once_init_leave       (volatile gsize *value_location,
-                                                 gsize           initialization_value);
+G_INLINE_FUNC gboolean  g_once_init_enter       (volatile gpointer *value_location);
+gboolean                g_once_init_enter_impl  (volatile gpointer *value_location);
+void                    g_once_init_leave       (volatile gpointer *value_location,
+                                                 gpointer           initialization_value);
 #if defined (G_CAN_INLINE) || defined (__G_THREAD_C__)
 G_INLINE_FUNC gboolean
-g_once_init_enter (volatile gsize *value_location)
+g_once_init_enter (volatile gpointer *value_location)
 {
   if G_LIKELY (g_atomic_pointer_get ((void*volatile*) value_location) != NULL)
     return FALSE;

=== modified file 'gobject/gtype.h'
--- gobject/gtype.h	2008-01-23 17:58:33 +0000
+++ gobject/gtype.h	2008-01-23 17:59:17 +0000
@@ -368,7 +368,7 @@
 GType \
 type_name##_get_type (void) \
 { \
-  static volatile gsize g_define_type_id__volatile = 0; \
+  static volatile gpointer g_define_type_id__volatile = 0; \
   if (g_once_init_enter (&g_define_type_id__volatile))  \
     { \
       GType g_define_type_id = \
@@ -383,9 +383,9 @@
 #define _G_DEFINE_TYPE_EXTENDED_END()	\
         /* following custom code */	\
       }					\
-      g_once_init_leave (&g_define_type_id__volatile, g_define_type_id); \
+      g_once_init_leave (&g_define_type_id__volatile, (gpointer) g_define_type_id); \
     }					\
-  return g_define_type_id__volatile;	\
+  return (GType) g_define_type_id__volatile;	\
 } /* closes type_name##_get_type() */

Places

File glib-cast.patch of Package glib2 (Revision 94c740becb99dc17c3d16302c3905964)

Places