luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-12-25 15:06:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "gatomic: statically assert that our assumptions hold"

Browse Source 
This reverts commit 7269d75321.

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
This commit is contained in:
Owen W. Taylor 2014-07-23 09:27:31 -04:00
parent d40a2df088
commit d0083f7e2d
1 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
glib/gatomic.h
View File

@ -87,9 +87,6 @@ G_END_DECLS
/* 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) && !defined(__clang__) #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) \ #define g_atomic_int_get(atomic) \
(G_GNUC_EXTENSION ({ \ (G_GNUC_EXTENSION ({ \
G_STATIC_ASSERT (sizeof *(atomic) == sizeof (gint)); \ G_STATIC_ASSERT (sizeof *(atomic) == sizeof (gint)); \
@ -119,9 +116,6 @@ G_STATIC_ASSERT (sizeof (gint) == 4);
#else /* GLIB_SIZEOF_VOID_P == 8 */ #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) \ #define g_atomic_pointer_get(atomic) \
(G_GNUC_EXTENSION ({ \ (G_GNUC_EXTENSION ({ \
G_STATIC_ASSERT (sizeof *(atomic) == sizeof (gpointer)); \ G_STATIC_ASSERT (sizeof *(atomic) == sizeof (gpointer)); \