38 lines
1.9 KiB
Diff
38 lines
1.9 KiB
Diff
# handle cast warning. borrow from OE, but updated with a better fix from glib
|
|
# developing tree.
|
|
#
|
|
# by Kevin Tian <kevin.tian@intel.com>, 06/25/2010
|
|
commit bf2719c815d719d1899b4bdb1b81ff6798471094
|
|
Author: Lars Ellenberg <lars.ellenberg@linbit.com>
|
|
Date: Thu Apr 15 19:03:05 2010 +0200
|
|
|
|
Cast to volatile to avoid warnings from -Wcast-qual
|
|
|
|
https://bugzilla.gnome.org/show_bug.cgi?id=457641
|
|
|
|
diff --git a/glib/gatomic.h b/glib/gatomic.h
|
|
index 7d9c318..22b28d9 100644
|
|
--- a/glib/gatomic.h
|
|
+++ b/glib/gatomic.h
|
|
@@ -64,16 +64,16 @@ void g_atomic_pointer_set (volatile gpointer G_GNUC_MAY_ALI
|
|
#else
|
|
# define g_atomic_int_get(atomic) \
|
|
((void) sizeof (gchar [sizeof (*(atomic)) == sizeof (gint) ? 1 : -1]), \
|
|
- (g_atomic_int_get) ((volatile gint G_GNUC_MAY_ALIAS *) (void *) (atomic)))
|
|
+ (g_atomic_int_get) ((volatile gint G_GNUC_MAY_ALIAS *) (volatile void *) (atomic)))
|
|
# define g_atomic_int_set(atomic, newval) \
|
|
((void) sizeof (gchar [sizeof (*(atomic)) == sizeof (gint) ? 1 : -1]), \
|
|
- (g_atomic_int_set) ((volatile gint G_GNUC_MAY_ALIAS *) (void *) (atomic), (newval)))
|
|
+ (g_atomic_int_set) ((volatile gint G_GNUC_MAY_ALIAS *) (volatile void *) (atomic), (newval)))
|
|
# define g_atomic_pointer_get(atomic) \
|
|
((void) sizeof (gchar [sizeof (*(atomic)) == sizeof (gpointer) ? 1 : -1]), \
|
|
- (g_atomic_pointer_get) ((volatile gpointer G_GNUC_MAY_ALIAS *) (void *) (atomic)))
|
|
+ (g_atomic_pointer_get) ((volatile gpointer G_GNUC_MAY_ALIAS *) (volatile void *) (atomic)))
|
|
# define g_atomic_pointer_set(atomic, newval) \
|
|
((void) sizeof (gchar [sizeof (*(atomic)) == sizeof (gpointer) ? 1 : -1]), \
|
|
- (g_atomic_pointer_set) ((volatile gpointer G_GNUC_MAY_ALIAS *) (void *) (atomic), (newval)))
|
|
+ (g_atomic_pointer_set) ((volatile gpointer G_GNUC_MAY_ALIAS *) (volatile void *) (atomic), (newval)))
|
|
#endif /* G_ATOMIC_OP_MEMORY_BARRIER_NEEDED */
|
|
|
|
#define g_atomic_int_inc(atomic) (g_atomic_int_add ((atomic), 1))
|