summaryrefslogtreecommitdiffstats
path: root/libcxx/include/support/win32/support.h
diff options
context:
space:
mode:
authorHoward Hinnant <hhinnant@apple.com>2013-09-17 01:34:47 +0000
committerHoward Hinnant <hhinnant@apple.com>2013-09-17 01:34:47 +0000
commit5f878d4bd2730576533183b62910c8a1c3d94119 (patch)
treee6bcc8fd921beaf9e9f576e515492fd4551a188c /libcxx/include/support/win32/support.h
parent226a56fa1dde6363cc6e246ddc1dda99517e609e (diff)
downloadbcm5719-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/support.h')
-rw-r--r--libcxx/include/support/win32/support.h7
1 files changed, 6 insertions, 1 deletions
diff --git a/libcxx/include/support/win32/support.h b/libcxx/include/support/win32/support.h
index 17abb915f7e..b953ab77ce3 100644
--- a/libcxx/include/support/win32/support.h
+++ b/libcxx/include/support/win32/support.h
@@ -15,11 +15,16 @@
Functions and constants used in libc++ that are missing from the Windows C library.
*/
-#include <cwchar> // mbstate_t
+#include <wchar.h> // mbstate_t
#include <cstdarg> // va_ macros
#define swprintf _snwprintf
#define vswprintf _vsnwprintf
+#ifndef NOMINMAX
+#define NOMINMAX
+#endif
+#include <Windows.h>
+
extern "C" {
int vasprintf( char **sptr, const char *__restrict fmt, va_list ap );
OpenPOWER on IntegriCloud