From: Ulrich Drepper <drepper@gmail.com>
Date: Sat, 21 Jan 2012 20:20:14 +0000 (-0500)
Subject: Fix version check in uchar.h
X-Git-Tag: glibc-2.16-tps~1057
X-Git-Url: https://sourceware.org/git/?a=commitdiff_plain;h=d220b1177777a2cd00d1b1eae62e1071a17ab46b;p=glibc.git

Fix version check in uchar.h
---

diff --git a/ChangeLog b/ChangeLog
index 1dda738687..f0f301706e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2012-01-21  Ulrich Drepper  <drepper@gmail.com>
+
+	* wcsmbs/uchar.h: Test __STDC_VERSION__.
+
 2012-01-20  Ulrich Drepper  <drepper@gmail.com>
 
 	* nscd/aicache.c (addhstaiX): Do not cache negative results of
diff --git a/wcsmbs/uchar.h b/wcsmbs/uchar.h
index ba36ef9bbc..3056c76365 100644
--- a/wcsmbs/uchar.h
+++ b/wcsmbs/uchar.h
@@ -44,7 +44,7 @@ __END_NAMESPACE_C99
 /* Define the 16-bit and 32-bit character types.  Use the information
    provided by the compiler.  */
 # if !defined __CHAR16_TYPE__ || !defined __CHAR32_TYPE__
-#  if defined __STDC__ && __STDC__ < 201000L
+#  if defined __STDC_VERSION__ && __STDC_VERSION__ < 201000L
 #   error "<uchar.h> requires ISO C11 mode"
 #  else
 #   error "definitions of __CHAR16_TYPE__ and/or __CHAR32_TYPE__ missing"