diff options
author | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2012-01-04 16:32:13 +0000 |
---|---|---|
committer | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2012-01-04 16:32:13 +0000 |
commit | 14f22ed439f917929febff22d58e2992a091dd01 (patch) | |
tree | d5734d77ef80c27965c370694883114773272ab7 /libc/assert/assert.h | |
parent | c3897eaf40726998877d1de877d009b6687a3011 (diff) |
Merge changes between r16494 and r16524 from /fsf/trunk.
git-svn-id: svn://svn.eglibc.org/trunk@16525 7b3dc134-2b1b-0410-93df-9e9f96275f8d
Diffstat (limited to 'libc/assert/assert.h')
-rw-r--r-- | libc/assert/assert.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/libc/assert/assert.h b/libc/assert/assert.h index 841f43597..4022e28b5 100644 --- a/libc/assert/assert.h +++ b/libc/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 |