diff options
| author | Alon Zakai <alonzakai@gmail.com> | 2011-12-10 17:26:15 -0800 |
|---|---|---|
| committer | Alon Zakai <alonzakai@gmail.com> | 2011-12-10 17:26:15 -0800 |
| commit | f59ffc338e2c1df792709a823be1c1d2735e88bf (patch) | |
| tree | 7268bc264e4364f9766f1b137882870bf7b90569 /system/include | |
| parent | 0162cc4bdc1955b442bec1a185d024d3d30cec0e (diff) | |
| parent | 3a35fd9389a18707abd51dc71e2096c64413d510 (diff) | |
Merge branch 'ta2bydefault'
Diffstat (limited to 'system/include')
| -rw-r--r-- | system/include/emscripten.h | 1 | ||||
| -rw-r--r-- | system/include/libc/sys/_types.h | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/system/include/emscripten.h b/system/include/emscripten.h index 482f7ef3..7b135c5a 100644 --- a/system/include/emscripten.h +++ b/system/include/emscripten.h @@ -16,6 +16,7 @@ extern "C" { * eval() the given script. */ extern void emscripten_run_script(const char *script); +extern int emscripten_run_script_int(const char *script); /* * This macro-looking function will cause Emscripten to diff --git a/system/include/libc/sys/_types.h b/system/include/libc/sys/_types.h index 44f0db87..c56fbd58 100644 --- a/system/include/libc/sys/_types.h +++ b/system/include/libc/sys/_types.h @@ -21,7 +21,7 @@ typedef long _off_t; typedef unsigned long long __dev_t; #else #ifndef __dev_t_defined -typedef unsigned long long __dev_t; /* XXX Emscripten */ +typedef unsigned __dev_t; /* XXX Emscripten */ #endif #endif @@ -33,7 +33,7 @@ typedef unsigned __gid_t; /* XXX Emscripten */ #endif #ifndef __off64_t_defined -__extension__ typedef long long _off64_t; +__extension__ typedef unsigned _off64_t; /* XXX Emscripten */ #endif /* |