BUG: Fix WIN32 define usage

Thibault-Pelletier · Thibault-Pelletier · commit 73793e011639 · 2025-07-01T08:53:38.000+02:00
diff --git a/CMake/SlicerMacroConfigureModuleCxxTestDriver.cmake b/CMake/SlicerMacroConfigureModuleCxxTestDriver.cmake
@@ -66,7 +66,7 @@ macro(SlicerMacroConfigureModuleCxxTestDriver)
     else()
     set(CMAKE_TESTDRIVER_BEFORE_TESTMAIN
       "${CMAKE_TESTDRIVER_BEFORE_TESTMAIN}\n// Direct VTK messages to standard output
-      #ifdef WIN32
+      #ifdef _WIN32
         vtkWin32OutputWindow* outputWindow =
           vtkWin32OutputWindow::SafeDownCast(vtkOutputWindow::GetInstance());
         if (outputWindow)
diff --git a/Extensions/Testing/CLIExtensionTemplate/CLIModuleTemplate/Testing/Cxx/CLIModuleTemplateTest.cxx b/Extensions/Testing/CLIExtensionTemplate/CLIModuleTemplate/Testing/Cxx/CLIModuleTemplateTest.cxx
@@ -11,7 +11,7 @@
 // STD includes
 #include <iostream>
 
-#ifdef WIN32
+#ifdef _WIN32
 # define MODULE_IMPORT __declspec(dllimport)
 #else
 # define MODULE_IMPORT
diff --git a/Extensions/Testing/SuperBuildExtensionTemplate/SuperCLIModuleTemplate/Testing/Cxx/SuperCLIModuleTemplateTest.cxx b/Extensions/Testing/SuperBuildExtensionTemplate/SuperCLIModuleTemplate/Testing/Cxx/SuperCLIModuleTemplateTest.cxx
@@ -11,7 +11,7 @@
 // STD includes
 #include <iostream>
 
-#ifdef WIN32
+#ifdef _WIN32
 # define MODULE_IMPORT __declspec(dllimport)
 #else
 # define MODULE_IMPORT
diff --git a/Libs/MRML/IDImageIO/itkMRMLIDIOPlugin.h b/Libs/MRML/IDImageIO/itkMRMLIDIOPlugin.h
@@ -3,7 +3,7 @@
 
 #include "itkObjectFactoryBase.h"
 
-#ifdef WIN32
+#ifdef _WIN32
 #ifdef MRMLIDIOPlugin_EXPORTS
 #define MRMLIDIOPlugin_EXPORT __declspec(dllexport)
 #else
diff --git a/Libs/MRML/Logic/vtkMRMLApplicationLogic.cxx b/Libs/MRML/Logic/vtkMRMLApplicationLogic.cxx
@@ -63,7 +63,7 @@
 #include <sstream>
 
 // For LoadDefaultParameterSets
-#ifdef WIN32
+#ifdef _WIN32
 # include <windows.h>
 #else
 # include <dirent.h>
@@ -690,7 +690,7 @@ int vtkMRMLApplicationLogic::LoadDefaultParameterSets(vtkMRMLScene* scene,
 //     {
 //     vtkDebugMacro("\nFindColorFiles: got user color file paths = " << this->UserColorFilePaths);
 //     // parse out the list, breaking at delimiter strings
-// #ifdef WIN32
+// #ifdef _WIN32
 //     const char *delim = ";";
 // #else
 //     const char *delim = ":";
@@ -716,7 +716,7 @@ int vtkMRMLApplicationLogic::LoadDefaultParameterSets(vtkMRMLScene* scene,
     filesVector.push_back(dirString);
     filesVector.emplace_back("/");
 
-#ifdef WIN32
+#ifdef _WIN32
     WIN32_FIND_DATA findData;
     HANDLE fileHandle;
     int flag = 1;
@@ -761,7 +761,7 @@ int vtkMRMLApplicationLogic::LoadDefaultParameterSets(vtkMRMLScene* scene,
         // take this file off so that can build the next file name
         filesVector.pop_back();
 
-#ifdef WIN32
+#ifdef _WIN32
         flag = FindNextFile(fileHandle, &findData);
       } // end of while flag
       FindClose(fileHandle);
diff --git a/Modules/CLI/AddScalarVolumes/Testing/AddScalarVolumesTest.cxx b/Modules/CLI/AddScalarVolumes/Testing/AddScalarVolumesTest.cxx
@@ -1,6 +1,6 @@
 #include "itkTestMain.h"
 
-#ifdef WIN32
+#ifdef _WIN32
 #define MODULE_IMPORT __declspec(dllimport)
 #else
 #define MODULE_IMPORT
diff --git a/Modules/CLI/CastScalarVolume/Testing/CastScalarVolumeTest.cxx b/Modules/CLI/CastScalarVolume/Testing/CastScalarVolumeTest.cxx
@@ -1,6 +1,6 @@
 #include "itkTestMain.h"
 
-#ifdef WIN32
+#ifdef _WIN32
 #define MODULE_IMPORT __declspec(dllimport)
 #else
 #define MODULE_IMPORT
diff --git a/Modules/CLI/CheckerBoardFilter/Testing/CheckerBoardFilterTest.cxx b/Modules/CLI/CheckerBoardFilter/Testing/CheckerBoardFilterTest.cxx
@@ -1,6 +1,6 @@
 #include "itkTestMain.h"
 
-#ifdef WIN32
+#ifdef _WIN32
 #define MODULE_IMPORT __declspec(dllimport)
 #else
 #define MODULE_IMPORT
diff --git a/Modules/CLI/CreateDICOMSeries/Testing/CreateDICOMSeriesTest.cxx b/Modules/CLI/CreateDICOMSeries/Testing/CreateDICOMSeriesTest.cxx
@@ -1,6 +1,6 @@
 #include "itkTestMain.h"
 
-#ifdef WIN32
+#ifdef _WIN32
 #define MODULE_IMPORT __declspec(dllimport)
 #else
 #define MODULE_IMPORT
diff --git a/Modules/CLI/CurvatureAnisotropicDiffusion/Testing/CurvatureAnisotropicDiffusionTest.cxx b/Modules/CLI/CurvatureAnisotropicDiffusion/Testing/CurvatureAnisotropicDiffusionTest.cxx
@@ -1,7 +1,7 @@
 #include <iostream>
 #include "itkTestMain.h"
 
-#ifdef WIN32
+#ifdef _WIN32
 #define MODULE_IMPORT __declspec(dllimport)
 #else
 #define MODULE_IMPORT
diff --git a/Modules/CLI/DiffusionTensorTest/Testing/DiffusionTensorTestTest.cxx b/Modules/CLI/DiffusionTensorTest/Testing/DiffusionTensorTestTest.cxx
@@ -1,6 +1,6 @@
 #include "itkTestMain.h"
 
-#ifdef WIN32
+#ifdef _WIN32
 #define MODULE_IMPORT __declspec(dllimport)
 #else
 #define MODULE_IMPORT
diff --git a/Modules/CLI/ExecutionModelTour/Testing/ExecutionModelTourTest.cxx b/Modules/CLI/ExecutionModelTour/Testing/ExecutionModelTourTest.cxx
@@ -1,6 +1,6 @@
 #include "itkTestMain.h"
 
-#ifdef WIN32
+#ifdef _WIN32
 #define MODULE_IMPORT __declspec(dllimport)
 #else
 #define MODULE_IMPORT
diff --git a/Modules/CLI/ExtractSkeleton/Testing/ExtractSkeletonTest.cxx b/Modules/CLI/ExtractSkeleton/Testing/ExtractSkeletonTest.cxx
@@ -1,6 +1,6 @@
 #include "itkTestMain.h"
 
-#ifdef WIN32
+#ifdef _WIN32
 #define MODULE_IMPORT __declspec(dllimport)
 #else
 #define MODULE_IMPORT
diff --git a/Modules/CLI/FiducialRegistration/Testing/FiducialRegistrationTest.cxx b/Modules/CLI/FiducialRegistration/Testing/FiducialRegistrationTest.cxx
@@ -1,6 +1,6 @@
 #include "itkTestMain.h"
 
-#ifdef WIN32
+#ifdef _WIN32
 #define MODULE_IMPORT __declspec(dllimport)
 #else
 #define MODULE_IMPORT
diff --git a/Modules/CLI/GaussianBlurImageFilter/Testing/GaussianBlurImageFilterTest.cxx b/Modules/CLI/GaussianBlurImageFilter/Testing/GaussianBlurImageFilterTest.cxx
@@ -1,6 +1,6 @@
 #include "itkTestMain.h"
 
-#ifdef WIN32
+#ifdef _WIN32
 #define MODULE_IMPORT __declspec(dllimport)
 #else
 #define MODULE_IMPORT
diff --git a/Modules/CLI/GradientAnisotropicDiffusion/Testing/GradientAnisotropicDiffusionTest.cxx b/Modules/CLI/GradientAnisotropicDiffusion/Testing/GradientAnisotropicDiffusionTest.cxx
@@ -1,6 +1,6 @@
 #include "itkTestMain.h"
 
-#ifdef WIN32
+#ifdef _WIN32
 #define MODULE_IMPORT __declspec(dllimport)
 #else
 #define MODULE_IMPORT
diff --git a/Modules/CLI/GrayscaleFillHoleImageFilter/Testing/GrayscaleFillHoleImageFilterTest.cxx b/Modules/CLI/GrayscaleFillHoleImageFilter/Testing/GrayscaleFillHoleImageFilterTest.cxx
@@ -1,6 +1,6 @@
 #include "itkTestMain.h"
 
-#ifdef WIN32
+#ifdef _WIN32
 #define MODULE_IMPORT __declspec(dllimport)
 #else
 #define MODULE_IMPORT
diff --git a/Modules/CLI/GrayscaleGrindPeakImageFilter/Testing/GrayscaleGrindPeakImageFilterTest.cxx b/Modules/CLI/GrayscaleGrindPeakImageFilter/Testing/GrayscaleGrindPeakImageFilterTest.cxx
@@ -1,6 +1,6 @@
 #include "itkTestMain.h"
 
-#ifdef WIN32
+#ifdef _WIN32
 #define MODULE_IMPORT __declspec(dllimport)
 #else
 #define MODULE_IMPORT
diff --git a/Modules/CLI/HistogramMatching/Testing/HistogramMatchingTest.cxx b/Modules/CLI/HistogramMatching/Testing/HistogramMatchingTest.cxx
@@ -1,6 +1,6 @@
 #include "itkTestMain.h"
 
-#ifdef WIN32
+#ifdef _WIN32
 #define MODULE_IMPORT __declspec(dllimport)
 #else
 #define MODULE_IMPORT
diff --git a/Modules/CLI/ImageLabelCombine/Testing/ImageLabelCombineTest.cxx b/Modules/CLI/ImageLabelCombine/Testing/ImageLabelCombineTest.cxx
@@ -1,6 +1,6 @@
 #include "itkTestMain.h"
 
-#ifdef WIN32
+#ifdef _WIN32
 #define MODULE_IMPORT __declspec(dllimport)
 #else
 #define MODULE_IMPORT
diff --git a/Modules/CLI/LabelMapSmoothing/Testing/LabelMapSmoothingTest.cxx b/Modules/CLI/LabelMapSmoothing/Testing/LabelMapSmoothingTest.cxx
@@ -1,6 +1,6 @@
 #include "itkTestMain.h"
 
-#ifdef WIN32
+#ifdef _WIN32
 #define MODULE_IMPORT __declspec(dllimport)
 #else
 #define MODULE_IMPORT
diff --git a/Modules/CLI/MaskScalarVolume/Testing/MaskScalarVolumeTest.cxx b/Modules/CLI/MaskScalarVolume/Testing/MaskScalarVolumeTest.cxx
@@ -1,6 +1,6 @@
 #include "itkTestMain.h"
 
-#ifdef WIN32
+#ifdef _WIN32
 #define MODULE_IMPORT __declspec(dllimport)
 #else
 #define MODULE_IMPORT
diff --git a/Modules/CLI/MedianImageFilter/Testing/MedianImageFilterTest.cxx b/Modules/CLI/MedianImageFilter/Testing/MedianImageFilterTest.cxx
@@ -1,6 +1,6 @@
 #include "itkTestMain.h"
 
-#ifdef WIN32
+#ifdef _WIN32
 #define MODULE_IMPORT __declspec(dllimport)
 #else
 #define MODULE_IMPORT
diff --git a/Modules/CLI/MergeModels/Testing/MergeModelsTest.cxx b/Modules/CLI/MergeModels/Testing/MergeModelsTest.cxx
@@ -1,6 +1,6 @@
 #include "itkTestMain.h"
 
-#ifdef WIN32
+#ifdef _WIN32
 #define MODULE_IMPORT __declspec(dllimport)
 #else
 #define MODULE_IMPORT
diff --git a/Modules/CLI/ModelMaker/Testing/ModelMakerTest.cxx b/Modules/CLI/ModelMaker/Testing/ModelMakerTest.cxx
@@ -1,6 +1,6 @@
 #include "itkTestMain.h"
 
-#ifdef WIN32
+#ifdef _WIN32
 #define MODULE_IMPORT __declspec(dllimport)
 #else
 #define MODULE_IMPORT
diff --git a/Modules/CLI/ModelToLabelMap/Testing/ModelToLabelMapTest.cxx b/Modules/CLI/ModelToLabelMap/Testing/ModelToLabelMapTest.cxx
@@ -1,6 +1,6 @@
 #include "itkTestMain.h"
 
-#ifdef WIN32
+#ifdef _WIN32
 #define MODULE_IMPORT __declspec(dllimport)
 #else
 #define MODULE_IMPORT
diff --git a/Modules/CLI/MultiplyScalarVolumes/Testing/MultiplyScalarVolumesTest.cxx b/Modules/CLI/MultiplyScalarVolumes/Testing/MultiplyScalarVolumesTest.cxx
@@ -1,6 +1,6 @@
 #include "itkTestMain.h"
 
-#ifdef WIN32
+#ifdef _WIN32
 #define MODULE_IMPORT __declspec(dllimport)
 #else
 #define MODULE_IMPORT
diff --git a/Modules/CLI/N4ITKBiasFieldCorrection/Testing/N4ITKBiasFieldCorrectionTest.cxx b/Modules/CLI/N4ITKBiasFieldCorrection/Testing/N4ITKBiasFieldCorrectionTest.cxx
@@ -1,6 +1,6 @@
 #include "itkTestMain.h"
 
-#ifdef WIN32
+#ifdef _WIN32
 #define MODULE_IMPORT __declspec(dllimport)
 #else
 #define MODULE_IMPORT
diff --git a/Modules/CLI/OrientScalarVolume/Testing/OrientScalarVolumeTest.cxx b/Modules/CLI/OrientScalarVolume/Testing/OrientScalarVolumeTest.cxx
@@ -1,6 +1,6 @@
 #include "itkTestMain.h"
 
-#ifdef WIN32
+#ifdef _WIN32
 #define MODULE_IMPORT __declspec(dllimport)
 #else
 #define MODULE_IMPORT
diff --git a/Modules/CLI/ResampleDTIVolume/Testing/ResampleDTIVolumeTest.cxx b/Modules/CLI/ResampleDTIVolume/Testing/ResampleDTIVolumeTest.cxx
@@ -8,7 +8,7 @@
 =========================================================================*/
 #include "itkTestMainExtended.h"
 
-#ifdef WIN32
+#ifdef _WIN32
 #define MODULE_IMPORT __declspec(dllimport)
 #else
 #define MODULE_IMPORT
diff --git a/Modules/CLI/ResampleScalarVectorDWIVolume/Testing/ResampleScalarVectorDWIVolumeTest.cxx b/Modules/CLI/ResampleScalarVectorDWIVolume/Testing/ResampleScalarVectorDWIVolumeTest.cxx
@@ -1,7 +1,7 @@
 
 #include "itkTestMain.h"
 
-#ifdef WIN32
+#ifdef _WIN32
 #define MODULE_IMPORT __declspec(dllimport)
 #else
 #define MODULE_IMPORT
diff --git a/Modules/CLI/ResampleScalarVolume/Testing/ResampleScalarVolumeTest.cxx b/Modules/CLI/ResampleScalarVolume/Testing/ResampleScalarVolumeTest.cxx
@@ -1,7 +1,7 @@
 
 #include "itkTestMain.h"
 
-#ifdef WIN32
+#ifdef _WIN32
 #define MODULE_IMPORT __declspec(dllimport)
 #else
 #define MODULE_IMPORT
diff --git a/Modules/CLI/SimpleRegionGrowingSegmentation/Testing/SimpleRegionGrowingSegmentationTest.cxx b/Modules/CLI/SimpleRegionGrowingSegmentation/Testing/SimpleRegionGrowingSegmentationTest.cxx
@@ -1,6 +1,6 @@
 #include "itkTestMain.h"
 
-#ifdef WIN32
+#ifdef _WIN32
 #define MODULE_IMPORT __declspec(dllimport)
 #else
 #define MODULE_IMPORT
diff --git a/Modules/CLI/SubtractScalarVolumes/Testing/SubtractScalarVolumesTest.cxx b/Modules/CLI/SubtractScalarVolumes/Testing/SubtractScalarVolumesTest.cxx
@@ -1,7 +1,7 @@
 
 #include "itkTestMain.h"
 
-#ifdef WIN32
+#ifdef _WIN32
 #define MODULE_IMPORT __declspec(dllimport)
 #else
 #define MODULE_IMPORT
diff --git a/Modules/CLI/TestGridTransformRegistration/Testing/TestGridTransformRegistrationTest.cxx b/Modules/CLI/TestGridTransformRegistration/Testing/TestGridTransformRegistrationTest.cxx
@@ -1,7 +1,7 @@
 
 #include "itkTestMain.h"
 
-#ifdef WIN32
+#ifdef _WIN32
 #define MODULE_IMPORT __declspec(dllimport)
 #else
 #define MODULE_IMPORT
diff --git a/Modules/CLI/ThresholdScalarVolume/Testing/ThresholdScalarVolumeTest.cxx b/Modules/CLI/ThresholdScalarVolume/Testing/ThresholdScalarVolumeTest.cxx
@@ -1,7 +1,7 @@
 
 #include "itkTestMain.h"
 
-#ifdef WIN32
+#ifdef _WIN32
 #define MODULE_IMPORT __declspec(dllimport)
 #else
 #define MODULE_IMPORT
diff --git a/Modules/CLI/VotingBinaryHoleFillingImageFilter/Testing/VotingBinaryHoleFillingImageFilterTest.cxx b/Modules/CLI/VotingBinaryHoleFillingImageFilter/Testing/VotingBinaryHoleFillingImageFilterTest.cxx
@@ -1,7 +1,7 @@
 
 #include "itkTestMain.h"
 
-#ifdef WIN32
+#ifdef _WIN32
 #define MODULE_IMPORT __declspec(dllimport)
 #else
 #define MODULE_IMPORT
diff --git a/Modules/Loadable/Colors/Logic/vtkSlicerColorLogic.cxx b/Modules/Loadable/Colors/Logic/vtkSlicerColorLogic.cxx
@@ -27,7 +27,7 @@
 #include <vtkObjectFactory.h>
 #include <vtksys/SystemTools.hxx>
 
-#ifdef WIN32
+#ifdef _WIN32
 #include <windows.h>
 #else
 #include <dirent.h>
@@ -128,7 +128,7 @@ std::vector<std::string> vtkSlicerColorLogic::FindUserColorFiles()
   {
     vtkDebugMacro("FindColorFiles: got user color file paths = " << this->UserColorFilePaths);
     // parse out the list, breaking at delimiter strings
-#ifdef WIN32
+#ifdef _WIN32
     const char* delim = ";";
 #else
     const char* delim = ":";
@@ -165,7 +165,7 @@ std::vector<std::string> vtkSlicerColorLogic::FindColorFiles(const std::vector<s
     filesVector.push_back(dirString);
     filesVector.emplace_back("/");
 
-#ifdef WIN32
+#ifdef _WIN32
     WIN32_FIND_DATA findData;
     HANDLE fileHandle;
     int flag = 1;
@@ -225,7 +225,7 @@ std::vector<std::string> vtkSlicerColorLogic::FindColorFiles(const std::vector<s
         // take this file off so that can build the next file name
         filesVector.pop_back();
 
-#ifdef WIN32
+#ifdef _WIN32
         flag = FindNextFile(fileHandle, &findData);
       } // end of while flag
       FindClose(fileHandle);
diff --git a/Utilities/Templates/Modules/CLI/Testing/Cxx/TemplateKeyTest.cxx b/Utilities/Templates/Modules/CLI/Testing/Cxx/TemplateKeyTest.cxx
@@ -11,7 +11,7 @@
 // STD includes
 #include <iostream>
 
-#ifdef WIN32
+#ifdef _WIN32
 # define MODULE_IMPORT __declspec(dllimport)
 #else
 # define MODULE_IMPORT
