diff options
| author | Brad King <brad.king@kitware.com> | 2015-06-15 13:56:52 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2015-06-15 13:58:29 (GMT) |
| commit | 83af11d4112443ed732cd240eb0bfdfd27048825 (patch) | |
| tree | ff429535c5b71a8761d6c9ed0c6b2027a1a3ecc1 /Source/cmFileCommand.cxx | |
| parent | 84672a84097444e1c280ec40d2a77f905cdb09cb (diff) | |
| download | CMake-83af11d4112443ed732cd240eb0bfdfd27048825.zip CMake-83af11d4112443ed732cd240eb0bfdfd27048825.tar.gz CMake-83af11d4112443ed732cd240eb0bfdfd27048825.tar.bz2 | |
Fix preprocessor checks WIN32 => _WIN32
The latter is predefined by Windows toolchains and is more reliable.
Reported-by: Michael Stürmer <michael.stuermer@schaeffler.com>
Diffstat (limited to 'Source/cmFileCommand.cxx')
| -rw-r--r-- | Source/cmFileCommand.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/cmFileCommand.cxx b/Source/cmFileCommand.cxx index 7440357..f740020 100644 --- a/Source/cmFileCommand.cxx +++ b/Source/cmFileCommand.cxx @@ -66,7 +66,7 @@ static mode_t mode_setuid = S_ISUID; static mode_t mode_setgid = S_ISGID; #endif -#if defined(WIN32) && defined(CMAKE_ENCODING_UTF8) +#if defined(_WIN32) && defined(CMAKE_ENCODING_UTF8) // libcurl doesn't support file:// urls for unicode filenames on Windows. // Convert string from UTF-8 to ACP if this is a file:// URL. static std::string fix_file_url_windows(const std::string& url) @@ -3156,7 +3156,7 @@ cmFileCommand::HandleDownloadCommand(std::vector<std::string> const& args) return false; } -#if defined(WIN32) && defined(CMAKE_ENCODING_UTF8) +#if defined(_WIN32) && defined(CMAKE_ENCODING_UTF8) url = fix_file_url_windows(url); #endif @@ -3411,7 +3411,7 @@ cmFileCommand::HandleUploadCommand(std::vector<std::string> const& args) unsigned long file_size = cmsys::SystemTools::FileLength(filename); -#if defined(WIN32) && defined(CMAKE_ENCODING_UTF8) +#if defined(_WIN32) && defined(CMAKE_ENCODING_UTF8) url = fix_file_url_windows(url); #endif |