fixed #14198 - consistently use built-in define _WIN32 in preprocessor checks

Author: firewave

cli/cppcheckexecutor.cpp

@@ -74,7 +74,7 @@
 #include <windows.h>
 #endif
 
-#if !defined(WIN32) && !defined(__MINGW32__)
+#if !defined(_WIN32) && !defined(__MINGW32__)
 #include <sys/wait.h> // WIFEXITED and friends
 #endif
 
@@ -684,7 +684,7 @@ int CppCheckExecutor::executeCommand(std::string exe, std::vector<std::string> a
         //std::cout << "pclose() errno " << std::to_string(err) << std::endl;
         return res;
     }
-#if !defined(WIN32) && !defined(__MINGW32__)
+#if !defined(_WIN32) && !defined(__MINGW32__)
     if (WIFEXITED(res)) {
         return WEXITSTATUS(res);
     }

cli/processexecutor.cpp

@@ -22,7 +22,7 @@
 
 #include "processexecutor.h"
 
-#if !defined(WIN32) && !defined(__MINGW32__)
+#if !defined(_WIN32) && !defined(__MINGW32__)
 
 #include "cppcheck.h"
 #include "errorlogger.h"

test/testprocessexecutor.cpp

@@ -112,7 +112,7 @@ class TestProcessExecutorBase : public TestFixture {
     }
 
     void run() override {
-#if !defined(WIN32) && !defined(__MINGW32__) && !defined(__CYGWIN__)
+#if !defined(_WIN32) && !defined(__MINGW32__) && !defined(__CYGWIN__)
         mNewTemplate = true;
         TEST_CASE(deadlock_with_many_errors);
         TEST_CASE(many_threads);

test/testsuppressions.cpp

@@ -60,7 +60,7 @@ class TestSuppressions : public TestFixture {
         TEST_CASE(suppressionsSettingsFS);
         TEST_CASE(suppressionsSettingsThreadsFiles);
         TEST_CASE(suppressionsSettingsThreadsFS);
-#if !defined(WIN32) && !defined(__MINGW32__) && !defined(__CYGWIN__)
+#if !defined(_WIN32) && !defined(__MINGW32__) && !defined(__CYGWIN__)
         TEST_CASE(suppressionsSettingsProcessesFiles);
         TEST_CASE(suppressionsSettingsProcessesFS);
 #endif
@@ -342,7 +342,7 @@ class TestSuppressions : public TestFixture {
         return exitCode;
     }
 
-#if !defined(WIN32) && !defined(__MINGW32__) && !defined(__CYGWIN__)
+#if !defined(_WIN32) && !defined(__MINGW32__) && !defined(__CYGWIN__)
     unsigned int checkSuppressionProcessesFiles(const char code[], const std::string &suppression = "") {
         return _checkSuppressionProcesses(code, false, suppression);
     }
@@ -928,7 +928,7 @@ class TestSuppressions : public TestFixture {
         runChecks(&TestSuppressions::checkSuppressionThreadsFS);
     }
 
-#if !defined(WIN32) && !defined(__MINGW32__) && !defined(__CYGWIN__)
+#if !defined(_WIN32) && !defined(__MINGW32__) && !defined(__CYGWIN__)
     void suppressionsSettingsProcessesFiles() {
         runChecks(&TestSuppressions::checkSuppressionProcessesFiles);
     }