diff options
| author | Jez Ng <me@jezng.com> | 2013-06-22 22:14:31 -0700 |
|---|---|---|
| committer | Jez Ng <me@jezng.com> | 2013-06-22 23:46:31 -0700 |
| commit | 7ff0dde7802ca3596457d3b15ece6949ed380a15 (patch) | |
| tree | e783289f86dca3b2c8970108773175ee97a67173 /src/library.js | |
| parent | 2b54c4f9164df8e7aced49930926589f7524de42 (diff) | |
| parent | c001e260ef766875fba65ae1f9848cfe6add90c7 (diff) | |
Merge remote-tracking branch 'upstream/incoming' into source-maps
Conflicts:
emcc
tools/js-optimizer.js
tools/js_optimizer.py
Diffstat (limited to 'src/library.js')
| -rw-r--r-- | src/library.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/library.js b/src/library.js index 33dcbd5f..01a67804 100644 --- a/src/library.js +++ b/src/library.js @@ -4399,7 +4399,7 @@ LibraryManager.library = { {{{ makeSetValueAsm('dest', 0, makeGetValueAsm('src', 0, 'i8'), 'i8') }}}; } } else { - _memcpy(dest, src, num); + _memcpy(dest, src, num) | 0; } }, llvm_memmove_i32: 'memmove', |