Skip to content

Commit 02018fe

Browse files
author
Eric Holk
committed
Step 3 of cdecl conversion.
1 parent 89ba649 commit 02018fe

File tree

1 file changed

+2
-5
lines changed

1 file changed

+2
-5
lines changed

src/rt/rust.cpp

+2-5
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,7 @@ command_line_args : public dom_owned<command_line_args>
7777
*/
7878

7979
extern "C" CDECL int
80-
rust_start(uintptr_t main_fn, int argc, char **argv, void* crate_map,
81-
uintptr_t main_fn_cdecl) {
80+
rust_start(uintptr_t main_fn, int argc, char **argv, void* crate_map) {
8281

8382
update_log_settings(crate_map, getenv("RUST_LOG"));
8483
rust_srv *srv = new rust_srv();
@@ -94,9 +93,7 @@ rust_start(uintptr_t main_fn, int argc, char **argv, void* crate_map,
9493
DLOG(dom, dom, "startup: arg[%d] = '%s'", i, args->argv[i]);
9594
}
9695

97-
if(main_fn) { printf("using new cdecl main\n"); }
98-
else { printf("using old cdecl main\n"); }
99-
dom->root_task->start(main_fn ? main_fn : main_fn_cdecl,
96+
dom->root_task->start(main_fn,
10097
(uintptr_t)args->args, sizeof(args->args));
10198

10299
int ret = dom->start_main_loop();

0 commit comments

Comments
 (0)