diff options
| author | Alon Zakai <alonzakai@gmail.com> | 2013-11-08 16:01:27 -0800 |
|---|---|---|
| committer | Alon Zakai <alonzakai@gmail.com> | 2013-11-08 16:04:05 -0800 |
| commit | b873dc778f52461129b1e28fb12dd3d4a309851c (patch) | |
| tree | e82913bc549a83104ce8abfb518eca6cb6d8aa83 /system/include/libcxx/support/win32/support.h | |
| parent | 140ea9e81feb09d8f2559995c73d49a39424ef5d (diff) | |
| parent | e0268fa1035a718341c53921eee9318d4a8033cd (diff) | |
Merge branch 'incoming' into f32
Conflicts:
src/parseTools.js
src/preamble.js
Diffstat (limited to 'system/include/libcxx/support/win32/support.h')
| -rw-r--r-- | system/include/libcxx/support/win32/support.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/system/include/libcxx/support/win32/support.h b/system/include/libcxx/support/win32/support.h index 17abb915..b953ab77 100644 --- a/system/include/libcxx/support/win32/support.h +++ b/system/include/libcxx/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 ); |