rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fixed Win32 compile errors.

Browse Source
This commit is contained in:
Eric Holk
2011-06-28 11:12:00 -07:00
committed by Graydon Hoare
parent 49a8cb34d2
commit 2f84987a48
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/rt/rust.cpp
View File

@@ -24,15 +24,15 @@ command_line_args : public kernel_owned<command_line_args>
LPCWSTR cmdline = GetCommandLineW(); LPCWSTR cmdline = GetCommandLineW();
LPWSTR *wargv = CommandLineToArgvW(cmdline, &argc); LPWSTR *wargv = CommandLineToArgvW(cmdline, &argc);
task->dom->win32_require("CommandLineToArgvW", wargv != NULL); 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) { for (int i = 0; i < argc; ++i) {
int n_chars = WideCharToMultiByte(CP_UTF8, 0, wargv[i], -1, int n_chars = WideCharToMultiByte(CP_UTF8, 0, wargv[i], -1,
NULL, 0, NULL, NULL); NULL, 0, NULL, NULL);
dom->win32_require("WideCharToMultiByte(0)", n_chars != 0); task->dom->win32_require("WideCharToMultiByte(0)", n_chars != 0);
argv[i] = (char *) dom->malloc(n_chars); argv[i] = (char *) kernel->malloc(n_chars);
n_chars = WideCharToMultiByte(CP_UTF8, 0, wargv[i], -1, n_chars = WideCharToMultiByte(CP_UTF8, 0, wargv[i], -1,
argv[i], n_chars, NULL, NULL); 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); LocalFree(wargv);
#endif #endif
@@ -66,9 +66,9 @@ command_line_args : public kernel_owned<command_line_args>
#ifdef __WIN32__ #ifdef __WIN32__
for (int i = 0; i < argc; ++i) { for (int i = 0; i < argc; ++i) {
task->free(argv[i]); kernel->free(argv[i]);
} }
task->free(argv); kernel->free(argv);
#endif #endif
} }
}; };

2
src/rt/rust_task.cpp
View File

@@ -57,7 +57,7 @@ rust_task::rust_task(rust_dom *dom, rust_task_list *state,
maybe_proxy<rust_task>(this), maybe_proxy<rust_task>(this),
stk(NULL), stk(NULL),
runtime_sp(0), runtime_sp(0),
rust_sp(NULL), rust_sp(0),
gc_alloc_chain(0), gc_alloc_chain(0),
dom(dom), dom(dom),
cache(NULL), cache(NULL),