Skip to content

Commit 2f84987

Browse files
Eric Holkgraydon
authored andcommitted
Fixed Win32 compile errors.
1 parent 49a8cb3 commit 2f84987

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

src/rt/rust.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,15 @@ command_line_args : public kernel_owned<command_line_args>
2424
LPCWSTR cmdline = GetCommandLineW();
2525
LPWSTR *wargv = CommandLineToArgvW(cmdline, &argc);
2626
task->dom->win32_require("CommandLineToArgvW", wargv != NULL);
27-
argv = (char **) dom->malloc(sizeof(char*) * argc);
27+
argv = (char **) kernel->malloc(sizeof(char*) * argc);
2828
for (int i = 0; i < argc; ++i) {
2929
int n_chars = WideCharToMultiByte(CP_UTF8, 0, wargv[i], -1,
3030
NULL, 0, NULL, NULL);
31-
dom->win32_require("WideCharToMultiByte(0)", n_chars != 0);
32-
argv[i] = (char *) dom->malloc(n_chars);
31+
task->dom->win32_require("WideCharToMultiByte(0)", n_chars != 0);
32+
argv[i] = (char *) kernel->malloc(n_chars);
3333
n_chars = WideCharToMultiByte(CP_UTF8, 0, wargv[i], -1,
3434
argv[i], n_chars, NULL, NULL);
35-
dom->win32_require("WideCharToMultiByte(1)", n_chars != 0);
35+
task->dom->win32_require("WideCharToMultiByte(1)", n_chars != 0);
3636
}
3737
LocalFree(wargv);
3838
#endif
@@ -66,9 +66,9 @@ command_line_args : public kernel_owned<command_line_args>
6666

6767
#ifdef __WIN32__
6868
for (int i = 0; i < argc; ++i) {
69-
task->free(argv[i]);
69+
kernel->free(argv[i]);
7070
}
71-
task->free(argv);
71+
kernel->free(argv);
7272
#endif
7373
}
7474
};

src/rt/rust_task.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ rust_task::rust_task(rust_dom *dom, rust_task_list *state,
5757
maybe_proxy<rust_task>(this),
5858
stk(NULL),
5959
runtime_sp(0),
60-
rust_sp(NULL),
60+
rust_sp(0),
6161
gc_alloc_chain(0),
6262
dom(dom),
6363
cache(NULL),

0 commit comments

Comments
 (0)