summary refs log tree commit diff
path: root/assert
diff options
context:
space:
mode:
authorFlorian Weimer <fweimer@redhat.com>2017-08-11 15:36:08 +0200
committerFlorian Weimer <fweimer@redhat.com>2017-08-11 15:36:08 +0200
commit8b2c63e4e2ad1fd161f80004ed30624f2a37b57b (patch)
treed83ca4b23f6813e201bcf31d5ac51e4f43a95bf3 /assert
parent86c6519ee77d241575653206f33dbe1d4c8436cf (diff)
downloadglibc-8b2c63e4e2ad1fd161f80004ed30624f2a37b57b.tar.gz
glibc-8b2c63e4e2ad1fd161f80004ed30624f2a37b57b.tar.xz
glibc-8b2c63e4e2ad1fd161f80004ed30624f2a37b57b.zip
assert: Suppress pedantic warning caused by statement expression
Diffstat (limited to 'assert')
-rw-r--r--assert/assert.h12
1 files changed, 9 insertions, 3 deletions
diff --git a/assert/assert.h b/assert/assert.h
index 22f019537c..6801cfeb10 100644
--- a/assert/assert.h
+++ b/assert/assert.h
@@ -91,13 +91,19 @@ __END_DECLS
      ? __ASSERT_VOID_CAST (0)						\
      : __assert_fail (#expr, __FILE__, __LINE__, __ASSERT_FUNCTION))
 # else
+/* The first occurrence of EXPR is not evaluated due to the sizeof,
+   but will trigger any pedantic warnings masked by the __extension__
+   for the second occurrence.  The explicit comparison against zero is
+   required to support function pointers and bit fields in this
+   context, and to suppress the evaluation of variable length
+   arrays.  */
 #  define assert(expr)							\
-    ({									\
+  ((void) sizeof ((expr) == 0), __extension__ ({			\
       if (expr)								\
         ; /* empty */							\
       else								\
         __assert_fail (#expr, __FILE__, __LINE__, __ASSERT_FUNCTION);	\
-    })
+    }))
 # endif
 
 # ifdef	__USE_GNU
@@ -113,7 +119,7 @@ __END_DECLS
    C9x has a similar variable called __func__, but prefer the GCC one since
    it demangles C++ function names.  */
 # if defined __cplusplus ? __GNUC_PREREQ (2, 6) : __GNUC_PREREQ (2, 4)
-#   define __ASSERT_FUNCTION	__PRETTY_FUNCTION__
+#   define __ASSERT_FUNCTION	__extension__ __PRETTY_FUNCTION__
 # else
 #  if defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L
 #   define __ASSERT_FUNCTION	__func__