[glib] Revert "gatomic: statically assert that our assumptions hold"
- From: Owen Taylor <otaylor src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib] Revert "gatomic: statically assert that our assumptions hold"
- Date: Wed, 23 Jul 2014 13:31:13 +0000 (UTC)
commit d0083f7e2dd621c6b78496bdb6ecf5d580c5e110
Author: Owen W. Taylor <otaylor fishsoup net>
Date: Wed Jul 23 09:27:31 2014 -0400
Revert "gatomic: statically assert that our assumptions hold"
This reverts commit 7269d75321b9d2a967a59fb35f243397f577eb41.
Adding G_STATIC_ASSERT() into a header file caused compilation
problems with at least one app (Anjuta). Reverting to keep
GNOME continuous testing running.
https://bugzilla.gnome.org/show_bug.cgi?id=730932
glib/gatomic.h | 6 ------
1 files changed, 0 insertions(+), 6 deletions(-)
---
diff --git a/glib/gatomic.h b/glib/gatomic.h
index 056a517..9d04b1d 100644
--- a/glib/gatomic.h
+++ b/glib/gatomic.h
@@ -87,9 +87,6 @@ G_END_DECLS
/* We prefer the new C11-style atomic extension of GCC if available */
#if defined(__ATOMIC_SEQ_CST) && !defined(__clang__)
-/* We use __atomic_load_4, so we rely on this being true */
-G_STATIC_ASSERT (sizeof (gint) == 4);
-
#define g_atomic_int_get(atomic) \
(G_GNUC_EXTENSION ({ \
G_STATIC_ASSERT (sizeof *(atomic) == sizeof (gint)); \
@@ -119,9 +116,6 @@ G_STATIC_ASSERT (sizeof (gint) == 4);
#else /* GLIB_SIZEOF_VOID_P == 8 */
-/* Assume that if GLIB_SIZEOF_VOID_P is not 8, it must be 4 */
-G_STATIC_ASSERT (sizeof (gpointer) == 4);
-
#define g_atomic_pointer_get(atomic) \
(G_GNUC_EXTENSION ({ \
G_STATIC_ASSERT (sizeof *(atomic) == sizeof (gpointer)); \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]