Fixing merge issues

This commit is contained in:
Lachlan Sneff
2018-12-06 22:44:16 -05:00
parent 0e024aa722
commit a29b480e85
3 changed files with 2 additions and 28 deletions

View File

@ -19,7 +19,7 @@ mod utils;
mod varargs;
pub use self::storage::{align_memory, static_alloc};
pub use self::utils::{is_emscripten_module, copy_cstr_array_into_wasm, allocate_on_stack, allocate_cstr_on_stack};
pub use self::utils::{is_emscripten_module, allocate_on_stack, allocate_cstr_on_stack};
// TODO: Magic number - how is this calculated?
const TOTAL_STACK: u32 = 5242880;