18-locale-win32.patch 1.0 KB

12345678910111213141516171819202122232425262728
  1. diff --git a/include/__support/win32/locale_win32.h b/include/__support/win32/locale_win32.h
  2. index d40e80e..1c6b4b5 100644
  3. --- a/include/__support/win32/locale_win32.h
  4. +++ b/include/__support/win32/locale_win32.h
  5. @@ -41,12 +41,8 @@
  6. #define LC_NUMERIC_MASK _M_NUMERIC
  7. #define LC_TIME_MASK _M_TIME
  8. #define LC_MESSAGES_MASK _M_MESSAGES
  9. -#define LC_ALL_MASK ( LC_COLLATE_MASK \
  10. - | LC_CTYPE_MASK \
  11. - | LC_MESSAGES_MASK \
  12. - | LC_MONETARY_MASK \
  13. - | LC_NUMERIC_MASK \
  14. - | LC_TIME_MASK )
  15. +#define LC_MESSAGES _X_MESSAGES
  16. +#define LC_ALL_MASK _M_ALL
  17. class __lconv_storage {
  18. public:
  19. @@ -219,7 +215,7 @@ decltype(MB_CUR_MAX) MB_CUR_MAX_L( locale_t __l );
  20. #define strtod_l _strtod_l
  21. #if defined(_LIBCPP_MSVCRT)
  22. #define strtof_l _strtof_l
  23. -#define strtold_l _strtold_l
  24. +#define strtold_l _strtod_l
  25. #else
  26. _LIBCPP_EXPORTED_FROM_ABI float strtof_l(const char*, char**, locale_t);
  27. _LIBCPP_EXPORTED_FROM_ABI long double strtold_l(const char*, char**, locale_t);