diff options
| author | Alon Zakai <alonzakai@gmail.com> | 2014-01-13 16:55:19 -0800 |
|---|---|---|
| committer | Alon Zakai <alonzakai@gmail.com> | 2014-01-13 16:56:03 -0800 |
| commit | cd1edebb5034ea52396a5b68304e84ae80878740 (patch) | |
| tree | 6a6f8364ea74985d11c4f6ff74e5b80e08dc849d /system/include/libcxx/support | |
| parent | af59788f8b7b76515e36bee1bf66edf497b801db (diff) | |
| parent | 2914deb17f3857bb02eeec87a58a3ed6d4a8853a (diff) | |
Merge branch 'incoming' of github.com:kripken/emscripten into incoming1.8.8
conflicts: tests/test_core.py tools/shared.py
Diffstat (limited to 'system/include/libcxx/support')
| -rw-r--r-- | system/include/libcxx/support/ibm/support.h | 2 | ||||
| -rw-r--r-- | system/include/libcxx/support/win32/locale_win32.h | 2 | ||||
| -rw-r--r-- | system/include/libcxx/support/win32/support.h | 1 |
3 files changed, 2 insertions, 3 deletions
diff --git a/system/include/libcxx/support/ibm/support.h b/system/include/libcxx/support/ibm/support.h index 3effbaed..0abfa7f9 100644 --- a/system/include/libcxx/support/ibm/support.h +++ b/system/include/libcxx/support/ibm/support.h @@ -15,7 +15,7 @@ extern "builtin" int __popcnt4(unsigned int); extern "builtin" int __popcnt8(unsigned long long); extern "builtin" unsigned int __cnttz4(unsigned int); extern "builtin" unsigned int __cnttz8(unsigned long long); -extern "builtin" unsigned int __cntlz4(unsigned long long); +extern "builtin" unsigned int __cntlz4(unsigned int); extern "builtin" unsigned int __cntlz8(unsigned long long); // Builtin functions for counting population diff --git a/system/include/libcxx/support/win32/locale_win32.h b/system/include/libcxx/support/win32/locale_win32.h index e768af50..f728d234 100644 --- a/system/include/libcxx/support/win32/locale_win32.h +++ b/system/include/libcxx/support/win32/locale_win32.h @@ -103,9 +103,9 @@ isupper_l(int c, _locale_t loc) #define sscanf_l( __s, __l, __f, ...) _sscanf_l( __s, __f, __l, __VA_ARGS__ ) #define vsscanf_l( __s, __l, __f, ...) _sscanf_l( __s, __f, __l, __VA_ARGS__ ) #define sprintf_l( __s, __l, __f, ... ) _sprintf_l( __s, __f, __l, __VA_ARGS__ ) -#define snprintf_l( __s, __n, __l, __f, ... ) _snprintf_l( __s, __n, __f, __l, __VA_ARGS__ ) #define vsprintf_l( __s, __l, __f, ... ) _vsprintf_l( __s, __f, __l, __VA_ARGS__ ) #define vsnprintf_l( __s, __n, __l, __f, ... ) _vsnprintf_l( __s, __n, __f, __l, __VA_ARGS__ ) +int snprintf_l(char *ret, size_t n, locale_t loc, const char *format, ...); int asprintf_l( char **ret, locale_t loc, const char *format, ... ); int vasprintf_l( char **ret, locale_t loc, const char *format, va_list ap ); diff --git a/system/include/libcxx/support/win32/support.h b/system/include/libcxx/support/win32/support.h index b953ab77..ed1986e6 100644 --- a/system/include/libcxx/support/win32/support.h +++ b/system/include/libcxx/support/win32/support.h @@ -23,7 +23,6 @@ #ifndef NOMINMAX #define NOMINMAX #endif -#include <Windows.h> extern "C" { |