diff options
| author | Brad King <brad.king@kitware.com> | 2015-06-16 14:39:12 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-06-16 14:39:12 (GMT) |
| commit | ee223dfa9138cfe960d5d7a6dc14b044b7e032bf (patch) | |
| tree | 2f92b1c02d0311c68ccd7753e78883c404000cdc /Source/cmFileCommand.cxx | |
| parent | e5ed8b22cb540425f7806257a96b834dcb3fb2c7 (diff) | |
| parent | 83af11d4112443ed732cd240eb0bfdfd27048825 (diff) | |
| download | CMake-ee223dfa9138cfe960d5d7a6dc14b044b7e032bf.zip CMake-ee223dfa9138cfe960d5d7a6dc14b044b7e032bf.tar.gz CMake-ee223dfa9138cfe960d5d7a6dc14b044b7e032bf.tar.bz2 | |
Merge topic 'fix-windows-preprocessor-checks'
83af11d4 Fix preprocessor checks WIN32 => _WIN32
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 |