diff options
| author | Ulrich Drepper <drepper@gmail.com> | 2012-01-07 10:39:03 -0500 |
|---|---|---|
| committer | Ulrich Drepper <drepper@gmail.com> | 2012-01-07 10:39:03 -0500 |
| commit | fbb68a84ee16345203f896f29b93e92a52582201 (patch) | |
| tree | 6ea41119ba1f55d479effba3e922845d5f76b9e2 /assert | |
| parent | 28926a1be178dd3b5811219e32b0d6b937bf21cf (diff) | |
| parent | 8ecd6b2a1283a28bcf56cfe48099fafa412a3929 (diff) | |
| download | glibc-fbb68a84ee16345203f896f29b93e92a52582201.tar.gz glibc-fbb68a84ee16345203f896f29b93e92a52582201.tar.xz glibc-fbb68a84ee16345203f896f29b93e92a52582201.zip | |
Merge branch 'master' of ssh://sourceware.org/git/glibc
Conflicts: ChangeLog
Diffstat (limited to 'assert')
| -rw-r--r-- | assert/assert.h | 4 |
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 |