luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-05-10 07:53:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '1940-bsd-atomics-failure' into 'master'

Browse Source 
gatomic: Temporarily disable C11-style atomics on FreeBSD

See merge request
This commit is contained in:
Simon McVittie 2019-11-15 20:23:41 +00:00
commit 4a57109b77
1 changed files with 3 additions and 1 deletions

4
glib/gatomic.h

@ -85,7 +85,9 @@ G_END_DECLS
#if defined(G_ATOMIC_LOCK_FREE) && defined(__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4) #if defined(G_ATOMIC_LOCK_FREE) && defined(__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4)
/* We prefer the new C11-style atomic extension of GCC if available */ /* We prefer the new C11-style atomic extension of GCC if available */
#if defined(__ATOMIC_SEQ_CST) /* FIXME: Temporarily disabled on FreeBSD due to CI failures:
* https://gitlab.gnome.org/GNOME/glib/issues/1940 */
#if defined(__ATOMIC_SEQ_CST) && !defined(__FreeBSD__)
#define g_atomic_int_get(atomic) \ #define g_atomic_int_get(atomic) \
(G_GNUC_EXTENSION ({ \ (G_GNUC_EXTENSION ({ \