diff options
| author | Eric Holk <eholk@mozilla.com> | 2011-06-28 11:12:00 -0700 |
|---|---|---|
| committer | Graydon Hoare <graydon@mozilla.com> | 2011-06-28 16:12:33 -0700 |
| commit | 2f84987a48c3625670cd62321f0e3dcb5c0e8768 (patch) | |
| tree | 85067ca589820f25b566bdf63a9990a9c49da216 /src/rt/rust.cpp | |
| parent | 49a8cb34d2b6e3f7af4a7cbe842fe48ffa0245eb (diff) | |
| download | rust-2f84987a48c3625670cd62321f0e3dcb5c0e8768.tar.gz rust-2f84987a48c3625670cd62321f0e3dcb5c0e8768.zip | |
Fixed Win32 compile errors.
Diffstat (limited to 'src/rt/rust.cpp')
| -rw-r--r-- | src/rt/rust.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/rt/rust.cpp b/src/rt/rust.cpp index 293d8562e4b..19f114d29a9 100644 --- a/src/rt/rust.cpp +++ b/src/rt/rust.cpp @@ -24,15 +24,15 @@ command_line_args : public kernel_owned<command_line_args> 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<command_line_args> #ifdef __WIN32__ for (int i = 0; i < argc; ++i) { - task->free(argv[i]); + kernel->free(argv[i]); } - task->free(argv); + kernel->free(argv); #endif } }; |
