summaryrefslogtreecommitdiffstats
path: root/libcxx/include/support/win32
diff options
context:
space:
mode:
authorHoward Hinnant <hhinnant@apple.com>2013-04-12 20:22:57 +0000
committerHoward Hinnant <hhinnant@apple.com>2013-04-12 20:22:57 +0000
commit24afdf71c14ca4379ad9f4c0ec2c2a0527677b4f (patch)
tree05fe074c4542ef9a26e226ad95da71e69221823e /libcxx/include/support/win32
parentd383db5172ac32016f0cd33e194eb7662d75203b (diff)
downloadbcm5719-llvm-24afdf71c14ca4379ad9f4c0ec2c2a0527677b4f.tar.gz
bcm5719-llvm-24afdf71c14ca4379ad9f4c0ec2c2a0527677b4f.zip
Ruben Van Boxem: Turn islower_l and isupper_l into functions (instead of macros) on Windows only to quell a warning during libc++ building.
llvm-svn: 179408
Diffstat (limited to 'libcxx/include/support/win32')
-rw-r--r--libcxx/include/support/win32/locale_win32.h17
1 files changed, 15 insertions, 2 deletions
diff --git a/libcxx/include/support/win32/locale_win32.h b/libcxx/include/support/win32/locale_win32.h
index e035420fb58..019586c0f4e 100644
--- a/libcxx/include/support/win32/locale_win32.h
+++ b/libcxx/include/support/win32/locale_win32.h
@@ -65,8 +65,21 @@ decltype(MB_CUR_MAX) MB_CUR_MAX_L( locale_t __l )
#define strtoull_l _strtoui64_l
// FIXME: current msvcrt does not know about long double
#define strtold_l _strtod_l
-#define islower_l _islower_l
-#define isupper_l _isupper_l
+
+inline _LIBCPP_INLINE_VISIBILITY
+int
+islower_l(int c, _locale_t loc)
+{
+ return _islower_l((int)c, loc);
+}
+
+inline _LIBCPP_INLINE_VISIBILITY
+int
+isupper_l(int c, _locale_t loc)
+{
+ return _isupper_l((int)c, loc);
+}
+
#define isdigit_l _isdigit_l
#define isxdigit_l _isxdigit_l
#define strcoll_l _strcoll_l
OpenPOWER on IntegriCloud