diff options
author | Gergely Nagy <ngg@ngg.hu> | 2017-10-31 13:10:07 (GMT) |
---|---|---|
committer | Gergely Nagy <ngg@ngg.hu> | 2017-10-31 13:10:07 (GMT) |
commit | 59849864592b421e0a8f993011e7e5c2ab27e77b (patch) | |
tree | 207b1887bb23b7052a4e6ca2f3e2df05040cb049 /src/msvc_helper-win32.cc | |
parent | e234a7bdb6c42f4539c0ab09b624f191287c2c10 (diff) | |
download | Ninja-59849864592b421e0a8f993011e7e5c2ab27e77b.zip Ninja-59849864592b421e0a8f993011e7e5c2ab27e77b.tar.gz Ninja-59849864592b421e0a8f993011e7e5c2ab27e77b.tar.bz2 |
Fix building on Windows in UNICODE mode
Diffstat (limited to 'src/msvc_helper-win32.cc')
-rw-r--r-- | src/msvc_helper-win32.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/msvc_helper-win32.cc b/src/msvc_helper-win32.cc index e37a26e..de6147a 100644 --- a/src/msvc_helper-win32.cc +++ b/src/msvc_helper-win32.cc @@ -43,10 +43,10 @@ int CLWrapper::Run(const string& command, string* output) { security_attributes.bInheritHandle = TRUE; // Must be inheritable so subprocesses can dup to children. - HANDLE nul = CreateFile("NUL", GENERIC_READ, - FILE_SHARE_READ | FILE_SHARE_WRITE | - FILE_SHARE_DELETE, - &security_attributes, OPEN_EXISTING, 0, NULL); + HANDLE nul = + CreateFileA("NUL", GENERIC_READ, + FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, + &security_attributes, OPEN_EXISTING, 0, NULL); if (nul == INVALID_HANDLE_VALUE) Fatal("couldn't open nul"); @@ -58,8 +58,8 @@ int CLWrapper::Run(const string& command, string* output) { Win32Fatal("SetHandleInformation"); PROCESS_INFORMATION process_info = {}; - STARTUPINFO startup_info = {}; - startup_info.cb = sizeof(STARTUPINFO); + STARTUPINFOA startup_info = {}; + startup_info.cb = sizeof(STARTUPINFOA); startup_info.hStdInput = nul; startup_info.hStdError = ::GetStdHandle(STD_ERROR_HANDLE); startup_info.hStdOutput = stdout_write; |