From 5143722d1440fccadbfa0848152bd2e9d76e0fcb Mon Sep 17 00:00:00 2001 From: Howard Hinnant Date: Thu, 29 Aug 2013 23:37:50 +0000 Subject: [PATCH] Xing Xue: Some minor changes for IBM XLC++/AIX. git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@189623 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/__locale | 2 +- include/support/ibm/xlocale.h | 2 -- src/locale.cpp | 5 +++++ 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/include/__locale b/include/__locale index 2c144d20..2390768c 100644 --- a/include/__locale +++ b/include/__locale @@ -363,7 +363,7 @@ public: # 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 fa349e0d..8d99a5c7 100644 --- a/include/support/ibm/xlocale.h +++ b/include/support/ibm/xlocale.h @@ -263,8 +263,6 @@ size_t wcsxfrm_l(wchar_t *__ws1, const wchar_t *__ws2, size_t __n, } #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 49ffd8e0..3f6d246e 100644 --- a/src/locale.cpp +++ b/src/locale.cpp @@ -109,6 +109,11 @@ countof(const T * const begin, const T * const end) } +#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;