[glib/wip/pwithnall/1940-atomic-types: 3/3] Revert "gatomic: Temporarily disable C11-style atomics on FreeBSD"
- From: Philip Withnall <pwithnall src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib/wip/pwithnall/1940-atomic-types: 3/3] Revert "gatomic: Temporarily disable C11-style atomics on FreeBSD"
- Date: Wed, 20 Nov 2019 12:14:13 +0000 (UTC)
commit 21fce30e9aced3887337854a08b56d47e75e450e
Author: Philip Withnall <withnall endlessm com>
Date: Wed Nov 20 12:12:04 2019 +0000
Revert "gatomic: Temporarily disable C11-style atomics on FreeBSD"
This reverts commit fd3ed5e31bc0d3d6a0a34d6482bb2ae10f186c06.
C11-style atomics have been fixed (on FreeBSD and other platforms) in
the previous commit, “gatomic: Check argument width in
g_atomic_pointer_compare_and_exchange()”.
See !1229 and #1940.
glib/gatomic.h | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
---
diff --git a/glib/gatomic.h b/glib/gatomic.h
index fb78c0cc1..6bf41bb74 100644
--- a/glib/gatomic.h
+++ b/glib/gatomic.h
@@ -85,9 +85,7 @@ G_END_DECLS
#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 */
-/* FIXME: Temporarily disabled on FreeBSD due to CI failures:
- * https://gitlab.gnome.org/GNOME/glib/issues/1940 */
-#if defined(__ATOMIC_SEQ_CST) && !defined(__FreeBSD__)
+#if defined(__ATOMIC_SEQ_CST)
#define g_atomic_int_get(atomic) \
(G_GNUC_EXTENSION ({ \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]