commit 0c06e58faef3b6b430f25cfcba1fa3aeb36bdb4b
author Howard Hinnant <hhinnant@apple.com> Thu Sep 29 13:33:15 2011 +0000
committer Howard Hinnant <hhinnant@apple.com> Thu Sep 29 13:33:15 2011 +0000
tree fdc95fe598c6bdc931362fd588e177d4a088e43c
parent f1e8b34f6c709fd54cee25efb3c59bc4a7c643fa

Windows patch work by Ruben Van Boxem

llvm-svn: 140781

libcxx/include/__locale

diff --git a/libcxx/include/__locale b/libcxx/include/__locale
index fb0eb8f..b2cbd38 100644
--- a/libcxx/include/__locale
+++ b/libcxx/include/__locale
@@ -319,7 +319,7 @@
     static const mask xdigit = _ISxdigit;
     static const mask blank  = _ISblank;
 #elif _WIN32
-    typedef unsigned __int32 mask;
+    typedef unsigned short mask;
     static const mask space  = _SPACE;
     static const mask print  = _BLANK|_PUNCT|_ALPHA|_DIGIT;
     static const mask cntrl  = _CONTROL;
@@ -557,7 +557,7 @@
 #endif
     _LIBCPP_ALWAYS_INLINE const mask* table() const  _NOEXCEPT {return __tab_;}
     static const mask* classic_table()  _NOEXCEPT;
-#ifndef _LIBCPP_HAS_DEFAULTRUNELOCALE
+#if defined(__GLIBC__)
     static const int* __classic_upper_table() _NOEXCEPT;
     static const int* __classic_lower_table() _NOEXCEPT;
 #endif