diff options
| author | Alon Zakai <alonzakai@gmail.com> | 2014-06-16 14:40:45 -0700 |
|---|---|---|
| committer | Alon Zakai <alonzakai@gmail.com> | 2014-06-16 14:40:45 -0700 |
| commit | ba387574f23867d889a04f1586e6dd9597e8bad8 (patch) | |
| tree | 6934000fdd9c173c552a382676b5046f58877b26 /src/library.js | |
| parent | 7acb48826165890ebc9d3794d8d7473aa62b762e (diff) | |
| parent | 7c26bbdb7d3c40d68777cc93f54ebfa5355a48bc (diff) | |
Merge branch 'incoming' into proxyGL
Diffstat (limited to 'src/library.js')
| -rw-r--r-- | src/library.js | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/src/library.js b/src/library.js index c17952b3..1f7fd37d 100644 --- a/src/library.js +++ b/src/library.js @@ -3166,7 +3166,7 @@ LibraryManager.library = { #endif environ: 'allocate(1, "i32*", ALLOC_STATIC)', __environ__deps: ['environ'], - __environ: '_environ', + __environ: 'environ', __buildEnvironment__deps: ['__environ'], __buildEnvironment: function(env) { // WARNING: Arbitrary limit! @@ -3388,9 +3388,20 @@ LibraryManager.library = { memcpy__sig: 'iiii', memcpy__deps: ['emscripten_memcpy_big'], memcpy: function(dest, src, num) { +#if USE_TYPED_ARRAYS == 0 + {{{ makeCopyValues('dest', 'src', 'num', 'null') }}}; + return num; +#endif +#if USE_TYPED_ARRAYS == 1 + {{{ makeCopyValues('dest', 'src', 'num', 'null') }}}; + return num; +#endif + dest = dest|0; src = src|0; num = num|0; var ret = 0; +#if USE_TYPED_ARRAYS if ((num|0) >= 4096) return _emscripten_memcpy_big(dest|0, src|0, num|0)|0; +#endif ret = dest|0; if ((dest&3) == (src&3)) { while (dest & 3) { |