From: Ulrich Drepper <drepper@gmail.com>
Date: Sat, 24 Dec 2011 03:55:44 +0000 (-0500)
Subject: Define static_assert
X-Git-Tag: glibc-2.16-tps~1127^2~13
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=839e283ece8f4a8312dd6c558df8c739356fddb7;p=thirdparty%2Fglibc.git

Define static_assert
---

diff --git a/ChangeLog b/ChangeLog
index eee573cc3cb..c85afad3217 100644
--- 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 69d4cbcc185..b276f3169ad 100644
--- a/NEWS
+++ b/NEWS
@@ -9,7 +9,7 @@ Version 2.16
 
 * The following bugs are resolved with this release:
 
-  13526
+  13526, 13529
 
 
 Version 2.15
diff --git a/assert/assert.h b/assert/assert.h
index 841f435973a..4022e28b55e 100644
--- 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