luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-11-11 11:56:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'wip/smcv/armel-atomic-pointer-get' into 'master'

Browse Source 
gatomic: Make fallback g_atomic_pointer_get type-safe

See merge request GNOME/glib!1949
This commit is contained in:
Philip Withnall 2021-02-15 21:47:41 +00:00
commit 58dd7a37c9
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
glib/gatomic.h
View File

@ -423,10 +423,24 @@ G_END_DECLS
#define g_atomic_int_dec_and_test(atomic) \ #define g_atomic_int_dec_and_test(atomic) \
(g_atomic_int_dec_and_test ((gint *) (atomic))) (g_atomic_int_dec_and_test ((gint *) (atomic)))
#if defined(glib_typeof)
/* The (void *) cast in the middle *looks* redundant, because
* g_atomic_pointer_get returns void * already, but it's to silence
* -Werror=bad-function-cast when we're doing something like:
* guintptr a, b; ...; a = g_atomic_pointer_get (&b);
* which would otherwise be assigning the void * result of
* g_atomic_pointer_get directly to the pointer-sized but
* non-pointer-typed result. */
#define g_atomic_pointer_get(atomic) \
(glib_typeof (*(atomic))) (void *) ((g_atomic_pointer_get) ((void *) atomic))
#else /* !defined(glib_typeof) */
#define g_atomic_pointer_get(atomic) \ #define g_atomic_pointer_get(atomic) \
(g_atomic_pointer_get (atomic)) (g_atomic_pointer_get (atomic))
#endif
#define g_atomic_pointer_set(atomic, newval) \ #define g_atomic_pointer_set(atomic, newval) \
(g_atomic_pointer_set ((atomic), (gpointer) (newval))) (g_atomic_pointer_set ((atomic), (gpointer) (newval)))
#define g_atomic_pointer_compare_and_exchange(atomic, oldval, newval) \ #define g_atomic_pointer_compare_and_exchange(atomic, oldval, newval) \
(g_atomic_pointer_compare_and_exchange ((atomic), (gpointer) (oldval), (gpointer) (newval))) (g_atomic_pointer_compare_and_exchange ((atomic), (gpointer) (oldval), (gpointer) (newval)))
#define g_atomic_pointer_add(atomic, val) \ #define g_atomic_pointer_add(atomic, val) \