fluencelabs/wasmer
1
0
Fork 0
mirror of https://github.com/fluencelabs/wasmer synced 2025-04-18 06:52:14 +00:00
Code Issues Projects Releases Wiki Activity

Finish merging

Browse Source
This commit is contained in:
Lachlan Sneff 2018-11-26 00:08:33 -05:00
parent 91265cb91e
commit c4b2e87c19
1 changed files with 0 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/apis/emscripten/mod.rs
View File

@ -159,7 +159,6 @@ pub fn generate_emscripten_env<'a, 'b>() -> ImportObject<&'a str, &'b str> {
"env", "env",
"___syscall140", "___syscall140",
ImportValue::Func(syscalls::___syscall140 as *const u8), ImportValue::Func(syscalls::___syscall140 as *const u8),
<<<<<<< HEAD
); );
import_object.set( import_object.set(
"env", "env",
@ -173,21 +172,6 @@ pub fn generate_emscripten_env<'a, 'b>() -> ImportObject<&'a str, &'b str> {
); );
import_object.set( import_object.set(
"env", "env",
=======
);
import_object.set(
"env",
"___syscall145",
ImportValue::Func(syscalls::___syscall145 as *const u8),
);
import_object.set(
"env",
"___syscall146",
ImportValue::Func(syscalls::___syscall146 as *const u8),
);
import_object.set(
"env",
>>>>>>> Add some syscalls
"___syscall221", "___syscall221",
ImportValue::Func(syscalls::___syscall221 as *const u8), ImportValue::Func(syscalls::___syscall221 as *const u8),
); );
@ -236,13 +220,8 @@ pub fn generate_emscripten_env<'a, 'b>() -> ImportObject<&'a str, &'b str> {
); );
import_object.set( import_object.set(
"env", "env",
<<<<<<< HEAD
"nullFunc_iii", "nullFunc_iii",
ImportValue::Func(nullfunc::nullfunc_iii as *const u8), ImportValue::Func(nullfunc::nullfunc_iii as *const u8),
=======
"nullFunc_iiii",
ImportValue::Func(nullfunc::nullfunc_iiii as *const u8),
>>>>>>> Add some syscalls
); );
import_object.set( import_object.set(
"env", "env",