summaryrefslogtreecommitdiff
path: root/wcsmbs
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 /wcsmbs
parent5e0d030065a49247b306a2b445fa7720b8ee09cb (diff)
downloadglibc-8ecd6b2a1283a28bcf56cfe48099fafa412a3929.tar.gz
Fix C11 header changes for C++.
Diffstat (limited to 'wcsmbs')
-rw-r--r--wcsmbs/uchar.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/wcsmbs/uchar.h b/wcsmbs/uchar.h
index bb5f3ba35c..706b9a243d 100644
--- a/wcsmbs/uchar.h
+++ b/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__