Parcourir la source

Fix preprocessor checks WIN32 => _WIN32

The latter is predefined by Windows toolchains and is more reliable.

Reported-by: Michael Stürmer <[email protected]>
Brad King il y a 10 ans
Parent
commit
83af11d411
3 fichiers modifiés avec 7 ajouts et 7 suppressions
  1. 3 3
      Source/cmExecProgramCommand.cxx
  2. 3 3
      Source/cmFileCommand.cxx
  3. 1 1
      Source/cmQtAutoGenerators.cxx

+ 3 - 3
Source/cmExecProgramCommand.cxx

@@ -156,7 +156,7 @@ bool cmExecProgramCommand::RunCommand(const char* command,
     verbose = false;
     }
 
-#if defined(WIN32) && !defined(__CYGWIN__)
+#if defined(_WIN32) && !defined(__CYGWIN__)
   // if the command does not start with a quote, then
   // try to find the program, and if the program can not be
   // found use system to run the command as it must be a built in
@@ -219,7 +219,7 @@ bool cmExecProgramCommand::RunCommand(const char* command,
     return false;
     }
 
-#if defined(WIN32) && !defined(__CYGWIN__)
+#if defined(_WIN32) && !defined(__CYGWIN__)
   if(dir)
     {
     cmsysProcess_SetWorkingDirectory(cp, dir);
@@ -305,7 +305,7 @@ bool cmExecProgramCommand::RunCommand(const char* command,
     }
   if(!msg.empty())
     {
-#if defined(WIN32) && !defined(__CYGWIN__)
+#if defined(_WIN32) && !defined(__CYGWIN__)
     // Old Windows process execution printed this info.
     msg += "\n\nfor command: ";
     msg += command;

+ 3 - 3
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
 

+ 1 - 1
Source/cmQtAutoGenerators.cxx

@@ -609,7 +609,7 @@ void cmQtAutoGenerators::SetupAutoGenerateTarget(cmTarget const* target)
 
   // Ensure we have write permission in case .in was read-only.
   mode_t perm = 0;
-#if defined(WIN32) && !defined(__CYGWIN__)
+#if defined(_WIN32) && !defined(__CYGWIN__)
   mode_t mode_write = S_IWRITE;
 #else
   mode_t mode_write = S_IWUSR;