diff options
| author | Howard Hinnant <hhinnant@apple.com> | 2013-09-17 01:34:47 +0000 |
|---|---|---|
| committer | Howard Hinnant <hhinnant@apple.com> | 2013-09-17 01:34:47 +0000 |
| commit | 5f878d4bd2730576533183b62910c8a1c3d94119 (patch) | |
| tree | e6bcc8fd921beaf9e9f576e515492fd4551a188c /libcxx/include/support/win32/limits_win32.h | |
| parent | 226a56fa1dde6363cc6e246ddc1dda99517e609e (diff) | |
| download | bcm5719-llvm-5f878d4bd2730576533183b62910c8a1c3d94119.tar.gz bcm5719-llvm-5f878d4bd2730576533183b62910c8a1c3d94119.zip | |
G M: Restore the ability for libcxx to compile again on mingw 64.
llvm-svn: 190837
Diffstat (limited to 'libcxx/include/support/win32/limits_win32.h')
| -rw-r--r-- | libcxx/include/support/win32/limits_win32.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libcxx/include/support/win32/limits_win32.h b/libcxx/include/support/win32/limits_win32.h index 52229c4ddec..a1fad20ecc1 100644 --- a/libcxx/include/support/win32/limits_win32.h +++ b/libcxx/include/support/win32/limits_win32.h @@ -12,16 +12,15 @@ #define _LIBCPP_SUPPORT_WIN32_LIMITS_WIN32_H #if !defined(_LIBCPP_MSVCRT) -#error "This header complements Microsoft's C Runtime library, and should not be included otherwise." +#error "This header complements the Microsoft C Runtime library, and should not be included otherwise." #else -#ifndef NOMINMAX -#define NOMINMAX -#endif -#include <windows.h> // ymath.h works correctly - +#include <limits.h> // CHAR_BIT #include <float.h> // limit constants +#if ! defined(__clang__) +#define __CHAR_BIT__ CHAR_BIT + #define __FLT_MANT_DIG__ FLT_MANT_DIG #define __FLT_DIG__ FLT_DIG #define __FLT_RADIX__ FLT_RADIX @@ -73,6 +72,7 @@ #define __builtin_nans(__dummy) _Snan._Double #define __builtin_nansf(__dummy) _FSnan._Float #define __builtin_nansl(__dummy) _LSnan._Long_double +#endif ! defined(__clang__) #endif // _LIBCPP_MSVCRT |
