diff options
| author | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2012-01-06 22:14:22 +0000 |
|---|---|---|
| committer | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2012-01-06 22:14:22 +0000 |
| commit | de06548e980675e65a1e6d850bb8c3a3f7ec638d (patch) | |
| tree | 70bcfdd2131f5c9693dc09d44158ef28123e3f46 /libc/wcsmbs | |
| parent | 14f22ed439f917929febff22d58e2992a091dd01 (diff) | |
| download | eglibc2-de06548e980675e65a1e6d850bb8c3a3f7ec638d.tar.gz | |
Merge changes between r16524 and r16568 from /fsf/trunk.
git-svn-id: svn://svn.eglibc.org/trunk@16569 7b3dc134-2b1b-0410-93df-9e9f96275f8d
Diffstat (limited to 'libc/wcsmbs')
| -rw-r--r-- | libc/wcsmbs/uchar.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libc/wcsmbs/uchar.h b/libc/wcsmbs/uchar.h index bb5f3ba35..706b9a243 100644 --- a/libc/wcsmbs/uchar.h +++ b/libc/wcsmbs/uchar.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2011 Free Software Foundation, Inc. +/* Copyright (C) 2011, 2012 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -40,7 +40,7 @@ __END_NAMESPACE_C99 #endif -#ifdef __GNUC__ +#if defined __GNUC__ && !defined __USE_ISOCXX11 /* Define the 16-bit and 32-bit character types. Use the information provided by the compiler. */ # if !defined __CHAR16_TYPE__ || !defined __CHAR32_TYPE__ |