aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlon Zakai <alonzakai@gmail.com>2014-01-14 16:23:45 -0800
committerAlon Zakai <alonzakai@gmail.com>2014-01-14 16:23:45 -0800
commita6effe0a86e59a656aaa27c01d107d2153f8c825 (patch)
treec0fe8745c4b56c02c43a1f25c08c7586581e0e05
parentdbcc4e8d33507117d69fe30e016b1e299f3f847f (diff)
fix wprintf-related bug that bit fastcomp1.8.11
-rw-r--r--system/lib/libc/musl/src/stdio/fputwc.c3
-rw-r--r--tools/shared.py2
2 files changed, 3 insertions, 2 deletions
diff --git a/system/lib/libc/musl/src/stdio/fputwc.c b/system/lib/libc/musl/src/stdio/fputwc.c
index 11db2804..e87e47d4 100644
--- a/system/lib/libc/musl/src/stdio/fputwc.c
+++ b/system/lib/libc/musl/src/stdio/fputwc.c
@@ -8,16 +8,17 @@ wint_t __fputwc_unlocked(wchar_t c, FILE *f)
char mbc[MB_LEN_MAX];
int l;
+#if 0 // XXX EMSCRIPTEN
f->mode |= f->mode+1;
if (isascii(c)) {
-#if 0 // XXX EMSCRIPTEN
c = putc_unlocked(c, f);
} else if (f->wpos + MB_LEN_MAX < f->wend) {
l = wctomb((void *)f->wpos, c);
if (l < 0) c = WEOF;
else f->wpos += l;
#else
+ if (isascii(c)) {
c = fputc(c, f);
#endif
} else {
diff --git a/tools/shared.py b/tools/shared.py
index 4870fcbb..9cc10e60 100644
--- a/tools/shared.py
+++ b/tools/shared.py
@@ -345,7 +345,7 @@ def find_temp_directory():
# we re-check sanity when the settings are changed)
# We also re-check sanity and clear the cache when the version changes
-EMSCRIPTEN_VERSION = '1.8.10'
+EMSCRIPTEN_VERSION = '1.8.11'
def generate_sanity():
return EMSCRIPTEN_VERSION + '|' + get_llvm_target() + '|' + LLVM_ROOT + '|' + get_clang_version()