Define static_assert

diff --git a/ChangeLog b/ChangeLog
index eee573cc3cbc0f4aa31cd0afbe9a7b725e76f0f0..c85afad32173bd59c98e102d605338f329311a65 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -28,6 +28,9 @@
 
 2011-12-23  Ulrich Drepper  <drepper@gmail.com>
 
+       [BZ #13529]
+       * assert/assert.h (static_assert): Define.
+
        * version.h: Update for 2.15 development version.
 
        [BZ #13526]

diff --git a/NEWS b/NEWS
index 69d4cbcc185c338e8c9274d7ab7b8a8bbf7efc2b..b276f3169adfe79ae37a2f8bcb0d4555853c5e4a 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -9,7 +9,7 @@ Version 2.16
 
 * The following bugs are resolved with this release:
 
-  13526
+  13526, 13529
 
 \f
 Version 2.15

diff --git a/assert/assert.h b/assert/assert.h
index 841f435973aa831a55aacf03c5a3c534ba7763c4..4022e28b55e24205d04c87fea6350310820befdb 100644 (file)
--- a/assert/assert.h
+++ b/assert/assert.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991,1992,1994-2001,2003,2004,2007
+/* Copyright (C) 1991,1992,1994-2001,2003,2004,2007,2011
    Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
@@ -113,3 +113,10 @@ __END_DECLS
 # endif
 
 #endif /* NDEBUG.  */
+
+
+#ifdef __USE_ISOC11
+/* Static assertion.  Requires support in the compiler.  */
+# undef static_assert
+# define static_assert _Static_assert
+#endif