Revert "Revert "Merge to upstream r304942.""

This reverts commit 38a0d5af7e. Test: make checkbuild Test: ./run_tests.py Test: ./run_tests.py --bitness 64
2018-01-17 14:21:02 -08:00
parent 38a0d5af7e
commit c79549b70e
1102 changed files with 19092 additions and 14798 deletions
--- a/include/stdlib.h
+++ b/include/stdlib.h
@@ -97,10 +97,6 @@ void *aligned_alloc(size_t alignment, size_t size);                       // C11

 extern "C++" {

-#ifdef _LIBCPP_MSVCRT
-#include "support/win32/locale_win32.h"
-#endif // _LIBCPP_MSVCRT
-
 #undef abs
 #undef div
 #undef labs