diff options
| author | Alon Zakai <alonzakai@gmail.com> | 2011-11-17 10:49:24 -0800 |
|---|---|---|
| committer | Alon Zakai <alonzakai@gmail.com> | 2011-11-17 10:49:24 -0800 |
| commit | f48ab8b31f1807931e1bf6180ac04bf00d126a90 (patch) | |
| tree | 101070965f1946d73adbc98eaaa4ce35d826856d /src/library.js | |
| parent | acccc5e85ada70e963934bdf21dfeb501fe63d98 (diff) | |
| parent | e2c5a4daa5af7c9130d616ebc68b23ec465fa1f9 (diff) | |
Merge branch 'master' of github.com:kripken/emscripten
Diffstat (limited to 'src/library.js')
| -rw-r--r-- | src/library.js | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/library.js b/src/library.js index 8127ece4..8c3740b3 100644 --- a/src/library.js +++ b/src/library.js @@ -3143,7 +3143,9 @@ LibraryManager.library = { // stdlib.h // ========================================================================== - malloc: Runtime.staticAlloc, + malloc: function(bytes) { + return Runtime.staticAlloc(bytes || 1); // accept 0 as an input because libc implementations tend to + }, _Znwj: 'malloc', _Znaj: 'malloc', _Znam: 'malloc', |