From 2f84987a48c3625670cd62321f0e3dcb5c0e8768 Mon Sep 17 00:00:00 2001 From: Eric Holk Date: Tue, 28 Jun 2011 11:12:00 -0700 Subject: [PATCH] Fixed Win32 compile errors. --- src/rt/rust.cpp | 12 ++++++------ src/rt/rust_task.cpp | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/rt/rust.cpp b/src/rt/rust.cpp index 293d8562e4b3..19f114d29a92 100644 --- a/src/rt/rust.cpp +++ b/src/rt/rust.cpp @@ -24,15 +24,15 @@ command_line_args : public kernel_owned LPCWSTR cmdline = GetCommandLineW(); LPWSTR *wargv = CommandLineToArgvW(cmdline, &argc); task->dom->win32_require("CommandLineToArgvW", wargv != NULL); - argv = (char **) dom->malloc(sizeof(char*) * argc); + argv = (char **) kernel->malloc(sizeof(char*) * argc); for (int i = 0; i < argc; ++i) { int n_chars = WideCharToMultiByte(CP_UTF8, 0, wargv[i], -1, NULL, 0, NULL, NULL); - dom->win32_require("WideCharToMultiByte(0)", n_chars != 0); - argv[i] = (char *) dom->malloc(n_chars); + task->dom->win32_require("WideCharToMultiByte(0)", n_chars != 0); + argv[i] = (char *) kernel->malloc(n_chars); n_chars = WideCharToMultiByte(CP_UTF8, 0, wargv[i], -1, argv[i], n_chars, NULL, NULL); - dom->win32_require("WideCharToMultiByte(1)", n_chars != 0); + task->dom->win32_require("WideCharToMultiByte(1)", n_chars != 0); } LocalFree(wargv); #endif @@ -66,9 +66,9 @@ command_line_args : public kernel_owned #ifdef __WIN32__ for (int i = 0; i < argc; ++i) { - task->free(argv[i]); + kernel->free(argv[i]); } - task->free(argv); + kernel->free(argv); #endif } }; diff --git a/src/rt/rust_task.cpp b/src/rt/rust_task.cpp index 52987c68d646..385e084cd6cc 100644 --- a/src/rt/rust_task.cpp +++ b/src/rt/rust_task.cpp @@ -57,7 +57,7 @@ rust_task::rust_task(rust_dom *dom, rust_task_list *state, maybe_proxy(this), stk(NULL), runtime_sp(0), - rust_sp(NULL), + rust_sp(0), gc_alloc_chain(0), dom(dom), cache(NULL),