about summary refs log tree commit diff
path: root/assert
diff options
context:
space:
mode:
authorJoseph Myers <joseph@codesourcery.com>2012-01-06 18:11:50 +0000
committerJoseph Myers <joseph@codesourcery.com>2012-01-06 18:11:50 +0000
commit8ecd6b2a1283a28bcf56cfe48099fafa412a3929 (patch)
treea1b43a7fc8170929747efa1505998dee2c2865e3 /assert
parent5e0d030065a49247b306a2b445fa7720b8ee09cb (diff)
downloadglibc-8ecd6b2a1283a28bcf56cfe48099fafa412a3929.tar.gz
glibc-8ecd6b2a1283a28bcf56cfe48099fafa412a3929.tar.xz
glibc-8ecd6b2a1283a28bcf56cfe48099fafa412a3929.zip
Fix C11 header changes for C++.
Diffstat (limited to 'assert')
-rw-r--r--assert/assert.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/assert/assert.h b/assert/assert.h
index 4022e28b55..2e3e2b568a 100644
--- a/assert/assert.h
+++ b/assert/assert.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991,1992,1994-2001,2003,2004,2007,2011
+/* Copyright (C) 1991,1992,1994-2001,2003,2004,2007,2011,2012
    Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
@@ -115,7 +115,7 @@ __END_DECLS
 #endif /* NDEBUG.  */
 
 
-#ifdef __USE_ISOC11
+#if defined __USE_ISOC11 && !defined __cplusplus
 /* Static assertion.  Requires support in the compiler.  */
 # undef static_assert
 # define static_assert _Static_assert