Xing Xue: Some minor changes for IBM XLC++/AIX.
llvm-svn: 189623
Cr-Mirrored-From: sso://chromium.googlesource.com/_direct/external/github.com/llvm/llvm-project
Cr-Mirrored-Commit: 976241362128b4e33fbf3b36a91acb6309edb205
diff --git a/include/__locale b/include/__locale
index 2c144d2..2390768 100644
--- a/include/__locale
+++ b/include/__locale
@@ -363,7 +363,7 @@
# else
static const mask blank = _CTYPE_B;
# endif
-#elif defined(__sun__)
+#elif defined(__sun__) && defined(_AIX)
typedef unsigned int mask;
static const mask space = _ISSPACE;
static const mask print = _ISPRINT;
diff --git a/include/support/ibm/xlocale.h b/include/support/ibm/xlocale.h
index fa349e0..8d99a5c 100644
--- a/include/support/ibm/xlocale.h
+++ b/include/support/ibm/xlocale.h
@@ -263,8 +263,6 @@
}
#endif // !defined(_AIX71)
-locale_t cloc(void);
-
// strftime_l() is defined by POSIX. However, AIX 7.1 does not have it
// implemented yet.
static inline
diff --git a/src/locale.cpp b/src/locale.cpp
index 49ffd8e..3f6d246 100644
--- a/src/locale.cpp
+++ b/src/locale.cpp
@@ -109,6 +109,11 @@
}
+#if defined(_AIX)
+// Set priority to INT_MIN + 256 + 150
+# pragma priority ( -2147483242 )
+#endif
+
const locale::category locale::none;
const locale::category locale::collate;
const locale::category locale::ctype;