Include <signal.h> in sysdeps/nptl/allocrtsig.c

[platform/upstream/glibc.git] / assert / assert.h

diff --git a/assert/assert.h b/assert/assert.h
index 15c5d05..ae77793 100644 (file)
--- a/assert/assert.h
+++ b/assert/assert.h
@@ -1,20 +1,19 @@
-/* Copyright (C) 1991,92,94,95,96,97,98,99,2000 Free Software Foundation, Inc.
+/* Copyright (C) 1991-2015 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    The GNU C Library is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
+   Lesser General Public License for more details.
 
-   You should have received a copy of the GNU Library General Public
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 /*
  *     ISO C99 Standard: 7.2 Diagnostics       <assert.h>
@@ -24,6 +23,7 @@
 
 # undef        _ASSERT_H
 # undef        assert
+# undef __ASSERT_VOID_CAST
 
 # ifdef        __USE_GNU
 #  undef assert_perror
@@ -34,6 +34,12 @@
 #define        _ASSERT_H       1
 #include <features.h>
 
+#if defined __cplusplus && __GNUC_PREREQ (2,95)
+# define __ASSERT_VOID_CAST static_cast<void>
+#else
+# define __ASSERT_VOID_CAST (void)
+#endif
+
 /* void assert (int expression);
 
    If NDEBUG is defined, do nothing.
@@ -41,7 +47,7 @@
 
 #ifdef NDEBUG
 
-# define assert(expr)          ((void) 0)
+# define assert(expr)          (__ASSERT_VOID_CAST (0))
 
 /* void assert_perror (int errnum);
 
@@ -50,7 +56,7 @@
    (This is a GNU extension.) */
 
 # ifdef        __USE_GNU
-#  define assert_perror(errnum)        ((void) 0)
+#  define assert_perror(errnum)        (__ASSERT_VOID_CAST (0))
 # endif
 
 #else /* Not NDEBUG.  */
@@ -58,14 +64,13 @@
 __BEGIN_DECLS
 
 /* This prints an "Assertion failed" message and aborts.  */
-extern void __assert_fail (__const char *__assertion, __const char *__file,
-                          unsigned int __line, __const char *__function)
+extern void __assert_fail (const char *__assertion, const char *__file,
+                          unsigned int __line, const char *__function)
      __THROW __attribute__ ((__noreturn__));
 
 /* Likewise, but prints the error text for ERRNUM.  */
-extern void __assert_perror_fail (int __errnum, __const char *__file,
-                                 unsigned int __line,
-                                 __const char *__function)
+extern void __assert_perror_fail (int __errnum, const char *__file,
+                                 unsigned int __line, const char *__function)
      __THROW __attribute__ ((__noreturn__));
 
 
@@ -77,16 +82,16 @@ extern void __assert (const char *__assertion, const char *__file, int __line)
 
 __END_DECLS
 
-# define assert(expr)                                                        \
-  ((void) ((expr) ? 0 :                                                              \
-          (__assert_fail (__STRING(expr),                                    \
-                          __FILE__, __LINE__, __ASSERT_FUNCTION), 0)))
+# define assert(expr)                                                  \
+  ((expr)                                                              \
+   ? __ASSERT_VOID_CAST (0)                                            \
+   : __assert_fail (__STRING(expr), __FILE__, __LINE__, __ASSERT_FUNCTION))
 
 # ifdef        __USE_GNU
-#  define assert_perror(errnum)                                                      \
-  ((void) (!(errnum) ? 0 : (__assert_perror_fail ((errnum),                  \
-                                                 __FILE__, __LINE__,         \
-                                                 __ASSERT_FUNCTION), 0)))
+#  define assert_perror(errnum)                                                \
+  (!(errnum)                                                           \
+   ? __ASSERT_VOID_CAST (0)                                            \
+   : __assert_perror_fail ((errnum), __FILE__, __LINE__, __ASSERT_FUNCTION))
 # endif
 
 /* Version 2.4 and later of GCC define a magical variable `__PRETTY_FUNCTION__'
@@ -100,8 +105,15 @@ __END_DECLS
 #  if defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L
 #   define __ASSERT_FUNCTION   __func__
 #  else
-#   define __ASSERT_FUNCTION   ((__const char *) 0)
+#   define __ASSERT_FUNCTION   ((const char *) 0)
 #  endif
 # endif
 
 #endif /* NDEBUG.  */
+
+
+#if defined __USE_ISOC11 && !defined __cplusplus
+/* Static assertion.  Requires support in the compiler.  */
+# undef static_assert
+# define static_assert _Static_assert
+#endif