0022972: Eliminate macro definitions that has compiler-provided analogs (WNT and...
authorakz <akz@opencascade.com>
Tue, 15 Sep 2015 14:46:43 +0000 (17:46 +0300)
committerkgv <kgv@opencascade.com>
Thu, 24 Sep 2015 11:13:06 +0000 (14:13 +0300)
1) Macro definition WNT replaced by _WIN32 and _MSC_VER for platform and compiler detection accordingly.
2) Macro definition LIN replaced by __linux__ macro.
3) Macro definition DEB replaced by OCCT_DEBUG macro.

180 files changed:
adm/CMPLRS
adm/cmake/occt_defs_flags.cmake
adm/genproj.tcl
adm/templates/template.vc10
adm/templates/template.vc10x
adm/templates/template.vc7
adm/templates/template.vc7x
adm/templates/template.vc8
adm/templates/template.vc8x
adm/templates/template.vc9
adm/templates/template.vc9x
src/AppBlend/AppBlend_Debug.cxx
src/AppCont/AppCont_ContMatrices.hxx
src/AppDef/AppDef_Variational.cxx
src/Aspect/Aspect_Drawable.hxx
src/Aspect/Aspect_Handle.hxx
src/Aspect/Aspect_XWD.hxx
src/BOPDS/BOPDS_PassKey.cxx
src/BOPDS/BOPDS_PaveBlock.cxx
src/BRepCheck/BRepCheck_Wire.cxx
src/BRepMesh/BRepMesh_Delaun.cxx
src/BRepMesh/BRepMesh_DiscretFactory.cxx
src/BRepTest/BRepTest_BasicCommands.cxx
src/BRepTest/BRepTest_CurveCommands.cxx
src/BRepTest/BRepTest_ExtremaCommands.cxx
src/BRepTest/BRepTest_GPropCommands.cxx
src/BRepTest/BRepTest_MatCommands.cxx
src/BRepTest/BRepTest_ProjectionCommands.cxx
src/BRepTest/BRepTest_SweepCommands.cxx
src/BRepTools/BRepTools_ShapeSet.cxx
src/BRepTopAdaptor/BRepTopAdaptor_FClass2d.cxx
src/Blend/Blend_Debug.cxx
src/Bnd/Bnd_BoundSortBox.cxx
src/CDF/CDF_FWOSDriver.cxx
src/CDF/CDF_Store.cxx
src/DBRep/DBRep_DrawableShape.cxx
src/DDF/DDF_BrowserCommands.cxx
src/DDF/DDF_IOStream.hxx
src/DDataStd/DDataStd_BasicCommands.cxx
src/DDataStd/DDataStd_DrawDisplayCommands.cxx
src/DDataStd/DDataStd_DrawPresentation.cxx
src/DNaming/DNaming_BasicCommands.cxx
src/DNaming/DNaming_ModelingCommands.cxx
src/DNaming/DNaming_TransformationDriver.cxx
src/DPrsStd/DPrsStd.cxx
src/Draw/COMMANDWINDOW.h
src/Draw/CommandWindow.cxx
src/Draw/Draw.cxx
src/Draw/DrawRessource.h
src/Draw/Draw_Appli.hxx
src/Draw/Draw_Grid.cxx
src/Draw/Draw_Interpretor.cxx
src/Draw/Draw_Main.cxx
src/Draw/Draw_Main.hxx
src/Draw/Draw_Viewer.cxx
src/Draw/Draw_Viewer.hxx
src/Draw/Draw_Window.cxx
src/Draw/MAINWINDOW.h
src/Draw/MainWindow.cxx
src/Draw/init.cxx
src/Draw/init.h
src/DrawDim/DrawDim.cxx
src/DrawDim/DrawDim_PlanarDimensionCommands.cxx
src/DrawTrSurf/DrawTrSurf_Triangulation.cxx
src/DrawTrSurf/DrawTrSurf_Triangulation2D.cxx
src/DsgPrs/DsgPrs_FilletRadiusPresentation.cxx
src/Expr/Expr_Operators.hxx
src/ExprIntrp/ExprIntrp_yaccanal.hxx
src/ExprIntrp/ExprIntrp_yacclex.cxx
src/ExprIntrp/lex.ExprIntrp.c
src/GeomToIGES/GeomToIGES_GeomSurface.cxx
src/GeometryTest/GeometryTest_API2dCommands.cxx
src/GeometryTest/GeometryTest_APICommands.cxx
src/GeometryTest/GeometryTest_ConstraintCommands.cxx
src/GeometryTest/GeometryTest_CurveCommands.cxx
src/GeometryTest/GeometryTest_PolyCommands.cxx
src/GeometryTest/GeometryTest_SurfaceCommands.cxx
src/GeometryTest/GeometryTest_TestProjCommands.cxx
src/GeomliteTest/GeomliteTest_API2dCommands.cxx
src/GeomliteTest/GeomliteTest_ApproxCommands.cxx
src/GeomliteTest/GeomliteTest_CurveCommands.cxx
src/GeomliteTest/GeomliteTest_ModificationCommands.cxx
src/GeomliteTest/GeomliteTest_SurfaceCommands.cxx
src/HLRTest/HLRTest.cxx
src/IGESToBRep/IGESToBRep_Reader.cxx
src/IntImp/IntImp_ComputeTangence.hxx
src/IntTools/IntTools.cxx
src/IntTools/IntTools_EdgeFace.cxx
src/Interface/Interface_CheckTool.cxx
src/Interface/Interface_FileReaderTool.cxx
src/LDOM/LDOMBasicString.cxx
src/LDOM/LDOMParser.cxx
src/LDOM/LDOM_BasicNode.cxx
src/LDOM/LDOM_XmlReader.cxx
src/LDOM/LDOM_XmlWriter.cxx
src/MAT2d/MAT2d_MapBiIntHasher.lxx
src/MeshTest/MeshTest.cxx
src/MeshVS/MeshVS_TextPrsBuilder.cxx
src/Message/Message_MsgFile.cxx
src/OSD/OSD.cxx
src/OSD/OSD_Chronometer.cxx
src/OSD/OSD_Directory.cxx
src/OSD/OSD_DirectoryIterator.cxx
src/OSD/OSD_Environment.cxx
src/OSD/OSD_Error.cxx
src/OSD/OSD_FileIterator.cxx
src/OSD/OSD_Host.cxx
src/OSD/OSD_MAllocHook.cxx
src/OSD/OSD_PThread.hxx
src/OSD/OSD_Path.cxx
src/OSD/OSD_Printer.cxx
src/OSD/OSD_Process.cxx
src/OSD/OSD_Protection.cxx
src/OSD/OSD_SharedLibrary.cxx
src/OSD/OSD_Thread.cxx
src/OSD/OSD_ThreadFunction.hxx
src/OSD/OSD_Timer.cxx
src/OSD/OSD_WNT.cxx
src/OSD/OSD_WNT_BREAK.hxx
src/OSD/OSD_signal.cxx
src/OSD/OSD_signal_WNT.cxx
src/OpenGl/OpenGl_AVIWriter.hxx
src/OpenGl/OpenGl_Window.cxx
src/PCDM/PCDM_ReadWriter_1.cxx
src/PCDM/PCDM_ReferenceIterator.cxx
src/Plugin/Plugin.cxx
src/Poly/Poly_CoherentNode.cxx
src/Poly/Poly_CoherentTriPtr.hxx
src/QABugs/QABugs_1.cxx
src/QABugs/QABugs_16.cxx
src/QABugs/QABugs_19.cxx
src/QABugs/QABugs_3.cxx
src/QABugs/QABugs_9.cxx
src/QADNaming/QADNaming_BasicCommands.cxx
src/Quantity/Quantity_Convert.lxx
src/STEPConstruct/STEPConstruct_AP203Context.cxx
src/Standard/Standard_ErrorHandler.cxx
src/Standard/Standard_MMgrOpt.cxx
src/Standard/Standard_MMgrTBBalloc.cxx
src/Standard/Standard_Macro.hxx
src/Standard/Standard_ThreadId.hxx
src/Standard/Standard_UUID.hxx
src/Standard/Standard_values.h
src/StepFile/lex.step.c
src/StepFile/step.tab.c
src/TDF/TDF_LabelMapHasher.lxx
src/TDataStd/TDataStd_NamedData.cxx
src/TDocStd/TDocStd_PathParser.cxx
src/TNaming/TNaming_Localizer.cxx
src/TNaming/TNaming_NamingTool.cxx
src/TNaming/TNaming_Selector.cxx
src/TObj/TObj_Model.cxx
src/TObjDRAW/TObjDRAW.cxx
src/TestTopOpe/TestTopOpe.cxx
src/TestTopOpe/TestTopOpe_BOOP.cxx
src/TestTopOpe/TestTopOpe_MesureCommands.cxx
src/TestTopOpeDraw/TestTopOpeDraw_Displayer.cxx
src/TopExp/TopExp_Explorer.cxx
src/TopOpeBRep/TopOpeBRep.cxx
src/TopOpeBRep/TopOpeBRep_FacesIntersector.cxx
src/Units/Units_Lexicon.cxx
src/UnitsAPI/UnitsAPI.cxx
src/V3d/V3d_View_Print.cxx
src/ViewerTest/ViewerTest.cxx
src/ViewerTest/ViewerTest_ViewerCommands.cxx
src/VrmlData/VrmlData_Geometry.cxx
src/VrmlData/VrmlData_Group.cxx
src/VrmlData/VrmlData_IndexedFaceSet.cxx
src/VrmlData/VrmlData_IndexedLineSet.cxx
src/VrmlData/VrmlData_Material.cxx
src/VrmlData/VrmlData_Node.cxx
src/VrmlData/VrmlData_Scene.cxx
src/VrmlData/VrmlData_WorldInfo.cxx
src/XDEDRAW/XDEDRAW.cxx
src/XSDRAWSTLVRML/XSDRAWSTLVRML.cxx
src/XmlLDrivers/XmlLDrivers_DocumentRetrievalDriver.cxx
src/XmlLDrivers/XmlLDrivers_DocumentStorageDriver.cxx
src/XmlMDataStd/XmlMDataStd_NamedDataDriver.cxx
src/math/math_FunctionRoots.cxx
src/math/math_Recipes.hxx

index 745205e..88ababc 100644 (file)
@@ -1,18 +1,18 @@
 wnt WOKSteps_exec_link DRAWEXE #WOKStep_EXELink(exec.tks)
 lin WOKSteps_exec_link DRAWEXE #WOKStep_EXELink(exec.tks)
 
-wnt cmplrs_cxx f -DWNT -D_WINDOWS -D_CRT_SECURE_NO_DEPRECATE -DHAVE_FREEIMAGE -DHAVE_GL2PS -DHAVE_TBB -DHAVE_OPENCL
-wnt cmplrs_cxx b -DWNT -D_WINDOWS -D_CRT_SECURE_NO_DEPRECATE -DHAVE_FREEIMAGE -DHAVE_GL2PS -DHAVE_TBB -DHAVE_OPENCL
+wnt cmplrs_cxx f -D_CRT_SECURE_NO_DEPRECATE -DHAVE_FREEIMAGE -DHAVE_GL2PS -DHAVE_TBB -DHAVE_OPENCL
+wnt cmplrs_cxx b -D_CRT_SECURE_NO_DEPRECATE -DHAVE_FREEIMAGE -DHAVE_GL2PS -DHAVE_TBB -DHAVE_OPENCL
 wnt cmplrs_cxx Aspect (wnt cmplrs_cxx b) -D_AFXDLL
-wnt cmplrs_cxx WNT (wnt cmplrs_cxx b) -D_AFXDLL -D_AFXDLL
+wnt cmplrs_cxx (wnt cmplrs_cxx b) -D_AFXDLL -D_AFXDLL
 
-wnt cmplrs_c f -DWNT -D_WINDOWS -D_CRT_SECURE_NO_DEPRECATE -DHAVE_FREEIMAGE -DHAVE_GL2PS -DHAVE_TBB -DHAVE_OPENCL
-wnt cmplrs_c b -DWNT -D_WINDOWS -D_CRT_SECURE_NO_DEPRECATE -DHAVE_FREEIMAGE -DHAVE_GL2PS -DHAVE_TBB -DHAVE_OPENCL
+wnt cmplrs_c f -D_CRT_SECURE_NO_DEPRECATE -DHAVE_FREEIMAGE -DHAVE_GL2PS -DHAVE_TBB -DHAVE_OPENCL
+wnt cmplrs_c b -D_CRT_SECURE_NO_DEPRECATE -DHAVE_FREEIMAGE -DHAVE_GL2PS -DHAVE_TBB -DHAVE_OPENCL
 wnt cmplrs_c NIS (wnt cmplrs_c b) -DSILGL -DSILGL_VRS=50
 
-lin cmplrs_cxx f -DLIN -DLININTEL -DOCC_CONVERT_SIGNALS -D_GNU_SOURCE=1 -DHAVE_FREEIMAGE -DHAVE_GL2PS -DHAVE_TBB -DHAVE_OPENCL
-lin cmplrs_cxx b -DLIN -DLININTEL -DOCC_CONVERT_SIGNALS -D_GNU_SOURCE=1 -DHAVE_FREEIMAGE -DHAVE_GL2PS -DHAVE_TBB -DHAVE_OPENCL
+lin cmplrs_cxx f -DOCC_CONVERT_SIGNALS -D_GNU_SOURCE=1 -DHAVE_FREEIMAGE -DHAVE_GL2PS -DHAVE_TBB -DHAVE_OPENCL
+lin cmplrs_cxx b -DOCC_CONVERT_SIGNALS -D_GNU_SOURCE=1 -DHAVE_FREEIMAGE -DHAVE_GL2PS -DHAVE_TBB -DHAVE_OPENCL
 
-lin cmplrs_c f -DLIN -DLININTEL -D_GNU_SOURCE=1 -fexceptions
-lin cmplrs_c b -DLIN -DLININTEL -D_GNU_SOURCE=1 -fexceptions
+lin cmplrs_c f -D_GNU_SOURCE=1 -fexceptions
+lin cmplrs_c b -D_GNU_SOURCE=1 -fexceptions
 
index a857f9f..60b5872 100644 (file)
@@ -13,11 +13,11 @@ endif()
 
 add_definitions (-DCSFDB)
 if (WIN32)
-  add_definitions (/DWNT -wd4996)
+  add_definitions (-wd4996)
 elseif (APPLE)
-  add_definitions (-fexceptions -fPIC -DOCC_CONVERT_SIGNALS -DHAVE_WOK_CONFIG_H -DHAVE_CONFIG_H)
+  add_definitions (-fexceptions -fPIC -DOCC_CONVERT_SIGNALS)
 else()
-  add_definitions (-fexceptions -fPIC -DOCC_CONVERT_SIGNALS -DHAVE_WOK_CONFIG_H -DHAVE_CONFIG_H -DLIN)
+  add_definitions (-fexceptions -fPIC -DOCC_CONVERT_SIGNALS)
 endif()
 
 # enable structured exceptions for MSVC
@@ -28,6 +28,34 @@ elseif (WIN32)
   set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -EHa")
 endif()
 
+# remove _WINDOWS flag if it exists
+string (REGEX MATCH "/D_WINDOWS" IS_WINDOWSFLAG "${CMAKE_CXX_FLAGS}")
+if (IS_WINDOWSFLAG)
+  message (STATUS "/D_WINDOWS has been removed from CMAKE_CXX_FLAGS")
+  string (REGEX REPLACE "/D_WINDOWS" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
+endif()
+
+# remove WIN32 flag if it exists
+string (REGEX MATCH "/DWIN32" IS_WIN32FLAG "${CMAKE_CXX_FLAGS}")
+if (IS_WIN32FLAG)
+  message (STATUS "/DWIN32 has been removed from CMAKE_CXX_FLAGS")
+  string (REGEX REPLACE "/DWIN32" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
+endif()
+
+# remove _WINDOWS flag if it exists
+string (REGEX MATCH "/D_WINDOWS" IS_WINDOWSFLAG "${CMAKE_C_FLAGS}")
+if (IS_WINDOWSFLAG)
+  message (STATUS "/D_WINDOWS has been removed from CMAKE_C_FLAGS")
+  string (REGEX REPLACE "/D_WINDOWS" "" CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
+endif()
+
+# remove WIN32 flag if it exists
+string (REGEX MATCH "/DWIN32" IS_WIN32FLAG "${CMAKE_C_FLAGS}")
+if (IS_WIN32FLAG)
+  message (STATUS "/DWIN32 has been removed from CMAKE_C_FLAGS")
+  string (REGEX REPLACE "/DWIN32" "" CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
+endif()
+
 # remove DEBUG flag if it exists
 string (REGEX MATCH "-DDEBUG" IS_DEBUG_CXX "${CMAKE_CXX_FLAGS_DEBUG}")
 if (IS_DEBUG_CXX)
@@ -64,7 +92,4 @@ if (DEFINED CMAKE_COMPILER_IS_GNUCXX OR "x${CMAKE_CXX_COMPILER_ID}" STREQUAL "xC
 endif()
 
 set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -DNo_Exception")
-set (CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -DNo_Exception")
-
-set (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DDEB")
-set (CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DDEB")
\ No newline at end of file
+set (CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -DNo_Exception")
\ No newline at end of file
index af862eb..42b4893 100644 (file)
@@ -2007,12 +2007,8 @@ proc osutils:cbpx { theOutDir theToolKit } {
     # extra macros
     lappend aTKDefines "CSFDB"
     if { "$aWokStation" == "wnt" } {
-      lappend aTKDefines "WNT"
       lappend aTKDefines "_CRT_SECURE_NO_DEPRECATE"
     } else {
-      if { "$aWokStation" == "lin" } {
-        lappend aTKDefines "LIN"
-      }
       lappend aTKDefines "OCC_CONVERT_SIGNALS"
       #lappend aTKDefines "_GNU_SOURCE=1"
     }
@@ -2283,12 +2279,8 @@ proc osutils:tkinfo { theRelativePath theToolKit theUsedLib theFrameworks theInc
   # extra macros
   lappend aTKDefines "CSFDB"
   if { "$aWokStation" == "wnt" } {
-    lappend aTKDefines "WNT"
     lappend aTKDefines "_CRT_SECURE_NO_DEPRECATE"
   } else {
-    if { "$aWokStation" == "lin" } {
-      lappend aTKDefines "LIN"
-    }
     lappend aTKDefines "OCC_CONVERT_SIGNALS"
     #lappend aTKDefines "_GNU_SOURCE=1"
   }
index a2ed38a..064aa2a 100644 (file)
@@ -85,7 +85,7 @@
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;WNT;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <ExceptionHandling>Async</ExceptionHandling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
     </ClCompile>
     <ResourceCompile>
       <AdditionalIncludeDirectories>..\..\..\inc;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;WNT;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>__TKDEP__;ws2_32.lib;vfw32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <Optimization>Disabled</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <PreprocessorDefinitions>DEB;_DEBUG;WIN32;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ExceptionHandling>Async</ExceptionHandling>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <AssemblerListingLocation>.\..\..\..\win32\__VCVER__\objd\__TKNAM__/</AssemblerListingLocation>
     </ClCompile>
     <ResourceCompile>
       <AdditionalIncludeDirectories>..\..\..\inc;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>DEB;_DEBUG;WIN32;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>__TKDEP__;ws2_32.lib;vfw32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <PreprocessorDefinitions>NDEBUG;WIN64;_WINDOWS;WNT;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <ExceptionHandling>Async</ExceptionHandling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
     </ClCompile>
     <ResourceCompile>
       <AdditionalIncludeDirectories>..\..\..\inc;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NDEBUG;WIN64;_WINDOWS;WNT;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>__TKDEP__;ws2_32.lib;vfw32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <Optimization>Disabled</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <PreprocessorDefinitions>DEB;_DEBUG;WIN64;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ExceptionHandling>Async</ExceptionHandling>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <AssemblerListingLocation>.\..\..\..\win64\__VCVER__\objd\__TKNAM__/</AssemblerListingLocation>
     </ClCompile>
     <ResourceCompile>
       <AdditionalIncludeDirectories>..\..\..\inc;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>DEB;_DEBUG;WIN64;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>__TKDEP__;ws2_32.lib;vfw32.lib;%(AdditionalDependencies)</AdditionalDependencies>
index 7ad650f..762ada8 100644 (file)
@@ -85,7 +85,7 @@
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;WNT;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <ExceptionHandling>Async</ExceptionHandling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
     </ClCompile>
     <ResourceCompile>
       <AdditionalIncludeDirectories>..\..\..\inc;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;WNT;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>__TKDEP__;%(AdditionalDependencies)</AdditionalDependencies>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <Optimization>Disabled</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <PreprocessorDefinitions>DEB;_DEBUG;WIN32;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ExceptionHandling>Async</ExceptionHandling>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <AssemblerListingLocation>.\..\..\..\win32\__VCVER__\objd\__XQTNAM__/</AssemblerListingLocation>
     </ClCompile>
     <ResourceCompile>
       <AdditionalIncludeDirectories>..\..\..\inc;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>DEB;_DEBUG;WIN32;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>__TKDEP__;%(AdditionalDependencies)</AdditionalDependencies>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <PreprocessorDefinitions>NDEBUG;WIN64;_WINDOWS;WNT;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <ExceptionHandling>Async</ExceptionHandling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
     </ClCompile>
     <ResourceCompile>
       <AdditionalIncludeDirectories>..\..\..\inc;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NDEBUG;WIN64;_WINDOWS;WNT;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>__TKDEP__;%(AdditionalDependencies)</AdditionalDependencies>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <Optimization>Disabled</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <PreprocessorDefinitions>DEB;_DEBUG;WIN64;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ExceptionHandling>Async</ExceptionHandling>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <AssemblerListingLocation>.\..\..\..\win64\__VCVER__\objd\__XQTNAM__/</AssemblerListingLocation>
     </ClCompile>
     <ResourceCompile>
       <AdditionalIncludeDirectories>..\..\..\inc;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>DEB;_DEBUG;WIN64;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>__TKDEP__;%(AdditionalDependencies)</AdditionalDependencies>
index 0ffd6e3..4a2f536 100644 (file)
@@ -22,7 +22,7 @@
                                AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
                                Optimization="2"
                                InlineFunctionExpansion="1"
-                               PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;WNT;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__"
+                               PreprocessorDefinitions="NDEBUG;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__"
                                StringPooling="TRUE"
                                RuntimeLibrary="2"
                                EnableFunctionLevelLinking="TRUE"
@@ -62,7 +62,7 @@
                        <Tool
                                Name="VCResourceCompilerTool"
                                AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
-                               PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;WNT;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__"
+                               PreprocessorDefinitions="NDEBUG;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__"
                                Culture="1036"/>
                        <Tool
                                Name="VCWebServiceProxyGeneratorTool"/>
@@ -89,8 +89,8 @@
                                AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
                                Optimization="0"
                                InlineFunctionExpansion="1"
-                               PreprocessorDefinitions="DEB;_DEBUG;WIN32;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__"
-        BasicRuntimeChecks="3"
+                               PreprocessorDefinitions="_DEBUG;CSFDB;$(CSF_DEFINES)__TKDEFS__"
+                               BasicRuntimeChecks="3"
                                RuntimeLibrary="3"
                                PrecompiledHeaderFile=".\..\..\..\win32\vc7\objd\__TKNAM__\__TKNAM__.pch"
                                AssemblerListingLocation=".\..\..\..\win32\vc7\objd\__TKNAM__/"
                        <Tool
                                Name="VCResourceCompilerTool"
                                AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
-                               PreprocessorDefinitions="DEB;_DEBUG;WIN32;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__"
+                               PreprocessorDefinitions="_DEBUG;CSFDB;$(CSF_DEFINES)__TKDEFS__"
                                Culture="1036"/>
                        <Tool
                                Name="VCWebServiceProxyGeneratorTool"/>
index 821035a..769fc92 100644 (file)
@@ -22,7 +22,7 @@
                                Name="VCCLCompilerTool"
                                AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
                                Optimization="0"
-                               PreprocessorDefinitions="WIN32;DEB;_DEBUG;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__"
+                               PreprocessorDefinitions="_DEBUG;CSFDB;$(CSF_DEFINES)__TKDEFS__"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="3"
                                AssemblerListingLocation=".\..\..\..\win32\vc7\objd\__XQTNAM__/"
@@ -61,7 +61,7 @@
                        <Tool
                                Name="VCResourceCompilerTool"
                                AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
-                               PreprocessorDefinitions="WIN32;DEB;_DEBUG;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__"
+                               PreprocessorDefinitions="_DEBUG;CSFDB;$(CSF_DEFINES)__TKDEFS__"
                                Culture="1033"/>
                        <Tool
                                Name="VCWebServiceProxyGeneratorTool"/>
@@ -86,7 +86,7 @@
                                AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
                                Optimization="2"
                                InlineFunctionExpansion="1"
-                               PreprocessorDefinitions="WIN32;NDEBUG;No_Exception;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__"
+                               PreprocessorDefinitions="NDEBUG;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__"
                                StringPooling="TRUE"
                                RuntimeLibrary="2"
                                EnableFunctionLevelLinking="TRUE"
                        <Tool
                                Name="VCResourceCompilerTool"
                                AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
-                               PreprocessorDefinitions="WIN32;NDEBUG;No_Exception;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__"
+                               PreprocessorDefinitions="NDEBUG;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__"
                                Culture="1033"/>
                        <Tool
                                Name="VCWebServiceProxyGeneratorTool"/>
index ca5bd7f..b76c872 100644 (file)
@@ -50,7 +50,7 @@
                                AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
                                Optimization="2"
                                InlineFunctionExpansion="1"
-                               PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;WNT;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__"
+                               PreprocessorDefinitions="NDEBUG;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__"
                                StringPooling="true"
                                ExceptionHandling="2"
                                RuntimeLibrary="2"
@@ -71,7 +71,7 @@
                        <Tool
                                Name="VCResourceCompilerTool"
                                AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
-                               PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;WNT;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__"
+                               PreprocessorDefinitions="NDEBUG;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__"
                                Culture="1036"
                        />
                        <Tool
                                AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
                                Optimization="0"
                                InlineFunctionExpansion="1"
-                               PreprocessorDefinitions="DEB;_DEBUG;WIN32;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__"
+                               PreprocessorDefinitions="_DEBUG;CSFDB;$(CSF_DEFINES)__TKDEFS__"
                                ExceptionHandling="2"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="3"
                        <Tool
                                Name="VCResourceCompilerTool"
                                AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
-                               PreprocessorDefinitions="DEB;_DEBUG;WIN32;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__"
+                               PreprocessorDefinitions="_DEBUG;CSFDB;$(CSF_DEFINES)__TKDEFS__"
                                Culture="1036"
                        />
                        <Tool
                                AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
                                Optimization="2"
                                InlineFunctionExpansion="1"
-                               PreprocessorDefinitions="NDEBUG;WIN64;_WINDOWS;WNT;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__"
+                               PreprocessorDefinitions="NDEBUG;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__"
                                StringPooling="true"
                                ExceptionHandling="2"
                                RuntimeLibrary="2"
                        <Tool
                                Name="VCResourceCompilerTool"
                                AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
-                               PreprocessorDefinitions="NDEBUG;WIN64;_WINDOWS;WNT;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__"
+                               PreprocessorDefinitions="NDEBUG;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__"
                                Culture="1036"
                        />
                        <Tool
                                AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
                                Optimization="0"
                                InlineFunctionExpansion="1"
-                               PreprocessorDefinitions="DEB;_DEBUG;WIN64;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__"
+                               PreprocessorDefinitions="_DEBUG;CSFDB;$(CSF_DEFINES)__TKDEFS__"
                                ExceptionHandling="2"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="3"
                        <Tool
                                Name="VCResourceCompilerTool"
                                AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
-                               PreprocessorDefinitions="DEB;_DEBUG;WIN64;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__"
+                               PreprocessorDefinitions="_DEBUG;CSFDB;$(CSF_DEFINES)__TKDEFS__"
                                Culture="1036"
                        />
                        <Tool
index 01c8bab..929a058 100644 (file)
@@ -49,7 +49,7 @@
                                Name="VCCLCompilerTool"
                                AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
                                Optimization="0"
-                               PreprocessorDefinitions="WIN32;DEB;_DEBUG;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__;"
+                               PreprocessorDefinitions="_DEBUG;CSFDB;$(CSF_DEFINES)__TKDEFS__;"
                                ExceptionHandling="2"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="3"
@@ -69,7 +69,7 @@
                        <Tool
                                Name="VCResourceCompilerTool"
                                AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
-                               PreprocessorDefinitions="WIN32;DEB;_DEBUG;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__;"
+                               PreprocessorDefinitions="_DEBUG;CSFDB;$(CSF_DEFINES)__TKDEFS__;"
                                Culture="1033"
                        />
                        <Tool
                                AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
                                Optimization="2"
                                InlineFunctionExpansion="1"
-                               PreprocessorDefinitions="WIN32;NDEBUG;No_Exception;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__;"
+                               PreprocessorDefinitions="NDEBUG;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__;"
                                StringPooling="true"
                                ExceptionHandling="2"
                                RuntimeLibrary="2"
                        <Tool
                                Name="VCResourceCompilerTool"
                                AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
-                               PreprocessorDefinitions="WIN32;NDEBUG;No_Exception;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__;"
+                               PreprocessorDefinitions="NDEBUG;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__;"
                                Culture="1033"
                        />
                        <Tool
                                AdditionalOptions="/favor:blend"
                                AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
                                Optimization="0"
-                               PreprocessorDefinitions="WIN64;DEB;_DEBUG;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__"
+                               PreprocessorDefinitions="_DEBUG;CSFDB;$(CSF_DEFINES)__TKDEFS__"
                                ExceptionHandling="2"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="3"
                        <Tool
                                Name="VCResourceCompilerTool"
                                AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
-                               PreprocessorDefinitions="WIN64;DEB;_DEBUG;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__"
+                               PreprocessorDefinitions="_DEBUG;CSFDB;$(CSF_DEFINES)__TKDEFS__"
                                Culture="1033"
                        />
                        <Tool
                                AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
                                Optimization="2"
                                InlineFunctionExpansion="1"
-                               PreprocessorDefinitions="WIN64;NDEBUG;No_Exception;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__"
+                               PreprocessorDefinitions="NDEBUG;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__"
                                StringPooling="true"
                                ExceptionHandling="2"
                                RuntimeLibrary="2"
                        <Tool
                                Name="VCResourceCompilerTool"
                                AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
-                               PreprocessorDefinitions="WIN64;NDEBUG;No_Exception;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__"
+                               PreprocessorDefinitions="NDEBUG;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__"
                                Culture="1033"
                        />
                        <Tool
index 9bd7358..f5b16e2 100644 (file)
@@ -52,7 +52,7 @@
                                AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
                                Optimization="2"
                                InlineFunctionExpansion="1"
-                               PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;WNT;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__"
+                               PreprocessorDefinitions="NDEBUG;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__"
                                StringPooling="true"
                                ExceptionHandling="2"
                                RuntimeLibrary="2"
@@ -73,7 +73,7 @@
                        <Tool
                                Name="VCResourceCompilerTool"
                                AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
-                               PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;WNT;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__"
+                               PreprocessorDefinitions="NDEBUG;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__"
                        />
                        <Tool
                                Name="VCPreLinkEventTool"
                                AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
                                Optimization="0"
                                InlineFunctionExpansion="1"
-                               PreprocessorDefinitions="DEB;_DEBUG;WIN32;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__"
+                               PreprocessorDefinitions="_DEBUG;CSFDB;$(CSF_DEFINES)__TKDEFS__"
                                ExceptionHandling="2"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="3"
                        <Tool
                                Name="VCResourceCompilerTool"
                                AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
-                               PreprocessorDefinitions="DEB;_DEBUG;WIN32;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__"
+                               PreprocessorDefinitions="_DEBUG;CSFDB;$(CSF_DEFINES)__TKDEFS__"
                        />
                        <Tool
                                Name="VCPreLinkEventTool"
                                AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
                                Optimization="2"
                                InlineFunctionExpansion="1"
-                               PreprocessorDefinitions="NDEBUG;WIN64;_WINDOWS;WNT;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__"
+                               PreprocessorDefinitions="NDEBUG;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__"
                                StringPooling="true"
                                ExceptionHandling="2"
                                RuntimeLibrary="2"
                        <Tool
                                Name="VCResourceCompilerTool"
                                AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
-                               PreprocessorDefinitions="NDEBUG;WIN64;_WINDOWS;WNT;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__"
+                               PreprocessorDefinitions="NDEBUG;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__"
                        />
                        <Tool
                                Name="VCPreLinkEventTool"
                                AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
                                Optimization="0"
                                InlineFunctionExpansion="1"
-                               PreprocessorDefinitions="DEB;_DEBUG;WIN64;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__"
+                               PreprocessorDefinitions="_DEBUG;CSFDB;$(CSF_DEFINES)__TKDEFS__"
                                ExceptionHandling="2"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="3"
                        <Tool
                                Name="VCResourceCompilerTool"
                                AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
-                               PreprocessorDefinitions="DEB;_DEBUG;WIN64;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__"
+                               PreprocessorDefinitions="_DEBUG;CSFDB;$(CSF_DEFINES)__TKDEFS__"
                        />
                        <Tool
                                Name="VCPreLinkEventTool"
index 5467a6b..591652f 100644 (file)
@@ -52,7 +52,7 @@
                                AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
                                Optimization="2"
                                InlineFunctionExpansion="1"
-                               PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;WNT;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__"
+                               PreprocessorDefinitions="NDEBUG;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__"
                                StringPooling="true"
                                ExceptionHandling="2"
                                RuntimeLibrary="2"
@@ -72,7 +72,7 @@
                        <Tool
                                Name="VCResourceCompilerTool"
                                AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
-                               PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;WNT;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__"
+                               PreprocessorDefinitions="NDEBUG;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__"
                        />
                        <Tool
                                Name="VCPreLinkEventTool"
                                AdditionalOptions="-MP"
                                AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
                                Optimization="0"
-                               PreprocessorDefinitions="DEB;_DEBUG;WIN32;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__"
+                               PreprocessorDefinitions="_DEBUG;CSFDB;$(CSF_DEFINES)__TKDEFS__"
                                ExceptionHandling="2"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="3"
                        <Tool
                                Name="VCResourceCompilerTool"
                                AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
-                               PreprocessorDefinitions="DEB;_DEBUG;WIN32;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__"
+                               PreprocessorDefinitions="_DEBUG;CSFDB;$(CSF_DEFINES)__TKDEFS__"
                        />
                        <Tool
                                Name="VCPreLinkEventTool"
                                AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
                                Optimization="2"
                                InlineFunctionExpansion="1"
-                               PreprocessorDefinitions="WIN64;NDEBUG;No_Exception;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__"
+                               PreprocessorDefinitions="NDEBUG;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__"
                                StringPooling="true"
                                ExceptionHandling="2"
                                RuntimeLibrary="2"
                        <Tool
                                Name="VCResourceCompilerTool"
                                AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
-                               PreprocessorDefinitions="WIN64;NDEBUG;No_Exception;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__"
+                               PreprocessorDefinitions="NDEBUG;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__"
                        />
                        <Tool
                                Name="VCPreLinkEventTool"
                                AdditionalOptions="-MP -favor:blend"
                                AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
                                Optimization="0"
-                               PreprocessorDefinitions="WIN64;DEB;_DEBUG;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__"
+                               PreprocessorDefinitions="_DEBUG;CSFDB;$(CSF_DEFINES)__TKDEFS__"
                                ExceptionHandling="2"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="3"
                        <Tool
                                Name="VCResourceCompilerTool"
                                AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
-                               PreprocessorDefinitions="WIN64;DEB;_DEBUG;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__"
+                               PreprocessorDefinitions="_DEBUG;CSFDB;$(CSF_DEFINES)__TKDEFS__"
                        />
                        <Tool
                                Name="VCPreLinkEventTool"
index 3b7c686..4a411f1 100644 (file)
@@ -17,7 +17,7 @@
 #include <Standard_Boolean.hxx>
 
 #ifndef __AppBlend_API
-# if defined(WNT) && !defined(HAVE_NO_DLL)
+# if defined(_WIN32) && !defined(HAVE_NO_DLL)
 #  ifdef __AppBlend_DLL
 #   define __AppBlend_API __declspec( dllexport )
 #  else
@@ -25,7 +25,7 @@
 #  endif /*__AppBlend_DLL*/
 # else
 #  define __AppBlend_API
-# endif /*WNT*/
+# endif /*_WIN32*/
 #endif /*__AppBlend_API*/
 
 //****************************************************
index 44113e0..861efbc 100644 (file)
@@ -18,7 +18,7 @@
 #include <Standard_Real.hxx>
 
 //#ifndef __AppCont_API
-//#if defined(WNT) && !defined(HAVE_NO_DLL)
+//#if defined(_WIN32) && !defined(HAVE_NO_DLL)
 //#  ifdef __AppCont_DLL
 //#   define __AppCont_API __declspec( dllexport )
 //#  else
@@ -26,7 +26,7 @@
 //#  endif  /* __AppCont_DLL */
 //# else
 //#  define __AppCont_API
-//# endif  /* WNT */
+//# endif  /* _WIN32 */
 //#endif  /* __AppCont_API */
 
 
index 622d255..87f3c7b 100644 (file)
 // Add this line:
 #include <algorithm>
 
-#if defined(WNT)
+#if defined(_MSC_VER)
 # include <stdio.h>
 # include <stdarg.h>
-#endif  /* WNT */
+#endif  /* _MSC_VER */
 
 //
 //=======================================================================
index 1d81797..eadfb13 100644 (file)
 #ifndef _Aspect_Drawable_HeaderFile
 #define _Aspect_Drawable_HeaderFile
 
-#ifdef WNT
+#ifdef _WIN32
  typedef void*        Aspect_Drawable; /* HDC under WNT */
 #else
  typedef unsigned long Aspect_Drawable;        /* Window or Pixmap under UNIX */
-#endif /* WNT */
+#endif /* _WIN32 */
 
 #endif /* _Aspect_Drawable_HeaderFile */
index 28476ee..660f253 100644 (file)
 #ifndef _Aspect_Handle_HeaderFile
 #define _Aspect_Handle_HeaderFile
 
-#ifdef WNT
+#ifdef _WIN32
  typedef void*         HANDLE;
  typedef HANDLE        Aspect_Handle;
 #else
  typedef unsigned long Aspect_Handle;
-#endif /* WNT */
+#endif /* _WIN32 */
 
 #endif /* _Aspect_Handle_HeaderFile */
index 041ac23..474e82c 100644 (file)
@@ -89,5 +89,5 @@ typedef struct _xcolor {
 
                } XColor;
 
-# endif /* WNT */
+# endif /* _WIN32 */
 #endif  /* __Aspect_WNTXWD_HXX */
index 311ad59..fcc5cdf 100644 (file)
@@ -19,7 +19,7 @@
 #include <BOPDS_PassKey.hxx>
 
 #include <stdio.h>
-#ifdef WNT
+#ifdef _MSC_VER
 #pragma warning( disable : 4101) 
 #endif
 
index c8fd2cf..f2c840c 100755 (executable)
@@ -23,7 +23,7 @@
 #include <Standard_Type.hxx>
 
 #include <algorithm>
-#ifdef WNT
+#ifdef _MSC_VER
 #pragma warning ( disable : 4291 )
 #endif
 
index d5ee807..9fbccc3 100644 (file)
@@ -74,9 +74,6 @@
 #include <TopTools_MapOfShape.hxx>
 
 #include <stdio.h>
-//Patch
-//#ifdef WNT
-//#endif
 static void Propagate(const TopTools_IndexedDataMapOfShapeListOfShape&,
                       const TopoDS_Shape&,   // edge
                       TopTools_MapOfShape&); // mapofedge
index 6f43de6..d635587 100644 (file)
@@ -2350,7 +2350,7 @@ Standard_Real BRepMesh_Delaun::polyArea(const BRepMesh::SequenceOfInteger& thePo
   return aArea / 2.;
 }
 
-#ifdef DEB
+#ifdef OCCT_DEBUG
 //=======================================================================
 //function : BRepMesh_DumpPoly
 //purpose  : 
index bc4e7d7..c54c2a9 100644 (file)
@@ -31,11 +31,11 @@ namespace
                                  TCollection_AsciiString& theLibName)
   {
     theLibName = "";
-  #ifndef WNT
+  #ifndef _WIN32
     theLibName += "lib";
   #endif
     theLibName += theDefaultName;
-  #ifdef WNT
+  #ifdef _WIN32
     theLibName += ".dll";
   #elif __APPLE__
     theLibName += ".dylib";
index 6feb10d..579ebae 100644 (file)
@@ -620,7 +620,6 @@ static Standard_Integer maxtolerance(Draw_Interpretor& theCommands,
 
   nbV = mapS.Extent();
 
-//#ifndef WNT
   Standard_SStream sss;
   sss << "\n## Tolerances on the shape " << a[1] << "  (nbFaces:" << nbF
       << "  nbEdges:" << nbE << " nbVtx:" << nbV << ")\n" ;
@@ -630,7 +629,7 @@ static Standard_Integer maxtolerance(Draw_Interpretor& theCommands,
   if(TmE<=TME) sss << "\n    Edge   : Min " << setw(8) << TmE <<"    Max  " << setw(8) << TME << " \n ";
   if(TmV<=TMV) sss << "\n    Vertex : Min " << setw(8) << TmV <<"    Max  " << setw(8) << TMV << " \n ";
   theCommands << sss;
-  //#endif*/
+
   return 0;
 }
 
index f413e21..2b974fe 100644 (file)
@@ -69,7 +69,7 @@
 #include <TopOpeBRepDS_Transition.hxx>
 
 #include <stdio.h>
-#ifdef WNT
+#ifdef _WIN32
 Standard_IMPORT Draw_Viewer dout;
 #endif
 
index 395c8e2..bddb926 100644 (file)
@@ -33,7 +33,7 @@
 #include <TColStd_MapIteratorOfPackedMapOfInteger.hxx>
 
 
-//#ifdef WNT
+//#ifdef _MSC_VER
 #include <stdio.h>
 //#endif
 
index 86f0b1c..2e2bc52 100644 (file)
@@ -33,7 +33,7 @@
 #include <Geom_Plane.hxx>
 #include <gp_Pln.hxx>
 
-#ifdef WNT
+#ifdef _WIN32
 Standard_IMPORT Draw_Viewer dout;
 #endif
 
index 11083e4..7a4d8c1 100644 (file)
@@ -50,7 +50,7 @@
 #include <DBRep.hxx>
 #include <TopoDS.hxx>
 
-#ifdef WNT
+#ifdef _WIN32
 Standard_IMPORT Draw_Viewer dout;
 #endif
 
index 0501c48..9caf045 100644 (file)
@@ -24,9 +24,8 @@
 #include <TopExp_Explorer.hxx>
 #include <BRepTest.hxx>
 #include <TopoDS.hxx>
-//#ifdef WNT
 #include <stdio.h>
-//#endif
+
 static Standard_Integer prj(Draw_Interpretor& di, Standard_Integer n, const char** a)
 { 
   char newname[255];
index ef1329c..4c1203b 100644 (file)
@@ -44,7 +44,6 @@
 
 static BRepOffsetAPI_MakePipeShell* Sweep= 0;
 
-//#ifdef WNT
 #include <stdio.h>
 #include <Geom_Curve.hxx>
 #include <GeomAdaptor_HCurve.hxx>
@@ -53,7 +52,6 @@ static BRepOffsetAPI_MakePipeShell* Sweep= 0;
 #include <BRepBuilderAPI_MakeFace.hxx>
 #include <BRep_Tool.hxx>
 #include <gp_Pnt.hxx>
-//#endi#include <gp_Vec.hxx>
 #include <gp_Vec.hxx>
 #include <Geom_Circle.hxx>
 #include <gp_Ax2.hxx>
index bba6e7d..526c021 100644 (file)
@@ -58,7 +58,7 @@
 
 #ifdef MacOS
 #define strcasecmp(p,q) strcmp(p,q)
-#elseif WNT
+#elseif _WIN32
 #define strcasecmp strcmp
 #elseif AIX
 #include <string.h>
index 3cb4ede..af8e377 100644 (file)
@@ -42,7 +42,7 @@
 #include <TopoDS_Edge.hxx>
 #include <TopoDS_Face.hxx>
 
-#ifdef WNT
+#ifdef _MSC_VER
 #include <stdio.h>
 #endif
 
index a3b716a..5ea6ee3 100644 (file)
@@ -17,7 +17,7 @@
 #include <Standard_Boolean.hxx>
 
 #ifndef __Blend_API
-# if defined(WNT) && !defined(HAVE_NO_DLL)
+# if defined(_WIN32) && !defined(HAVE_NO_DLL)
 #  ifdef __Blend_DLL
 #   define __Blend_API __declspec( dllexport )
 #  else
@@ -25,7 +25,7 @@
 #  endif /*__Blend_DLL*/
 # else
 #  define __Blend_API
-# endif /*WNT*/
+# endif /*_WIN32*/
 #endif /*__Blend_API*/
 
 //*************************************************
index 99d80f2..497ab1d 100644 (file)
@@ -25,8 +25,6 @@
 #include <TColStd_ListIteratorOfListOfInteger.hxx>
 
 #include <stdio.h>
-//#if defined(WNT) || defined(LIN)
-//#endif  // WNT
 //-- ================================================================================
 //--  lbr le 27 fev 97
 //--  
index feb5ddb..c517253 100644 (file)
@@ -25,9 +25,9 @@
 #include <TCollection_ExtendedString.hxx>
 #include <UTL.hxx>
 
-#ifdef WNT
+#ifdef _MSC_VER
 #include <tchar.h>
-#endif  // WNT
+#endif  // _MSC_VER
 
 
 //==============================================================================
 //purpose  :
 //==============================================================================
 static void PutSlash (TCollection_ExtendedString& anXSTRING) {
-#ifdef WNT
+#ifdef _WIN32
   anXSTRING+="\\";
 #else
   anXSTRING+="/";
-#endif  // WNT
+#endif  // _WIN32
 }
 
 //==============================================================================
@@ -169,7 +169,7 @@ TCollection_ExtendedString CDF_FWOSDriver::DefaultFolder()
   TCollection_ExtendedString theDefaultFolder;
   if (theDefaultFolder.Length() == 0) {
     
-#ifdef WNT
+#ifdef _WIN32
     TCollection_ExtendedString hd=UTL::xgetenv("HOMEDRIVE");
     if(hd.Length() != NULL) {
       theDefaultFolder=hd;
@@ -218,7 +218,7 @@ TCollection_ExtendedString CDF_FWOSDriver::SetName(const Handle(CDM_Document)& a
   
   TCollection_ExtendedString xn(aName), n(aName);
 
-#ifdef WNT
+#ifdef _WIN32
   //windows is not case sensitive
   //make the extension lower case
   for(int i = 1; i <= xn.Length(); i++)
@@ -232,7 +232,7 @@ TCollection_ExtendedString CDF_FWOSDriver::SetName(const Handle(CDM_Document)& a
   TCollection_ExtendedString e (aDocument->FileExtension());
   TCollection_ExtendedString xe(e);
   if (e.Length() > 0) {
-#ifdef WNT
+#ifdef _WIN32
     //windows is not case sensitive
     //make the extension lower case
     for(int i = 1; i <= xe.Length(); i++)
index 5338669..9a44647 100644 (file)
@@ -122,7 +122,7 @@ Standard_Boolean  CDF_Store::SetFolder(const TCollection_ExtendedString& aFolder
   // it is removed.
        // This is correct for Unix systems but not for Windows! VMS and MAC? Thomas Haller, 23.11.01
   if(l > 1) {
-#ifndef WNT
+#ifndef _WIN32
     if(theFolder.Value(l) == theFolder.Value(1)) theFolder.Trunc(l-1);
 #else
        if (theFolder.Value(l) == '/' || theFolder.Value(l) == '\\')
index 634fc02..36e7b65 100644 (file)
@@ -69,7 +69,7 @@ static Standard_Integer PlotCount = 0;    // PlotEdge and PlotIso for cases of "
                                           // PlotEdge or PlotIso
 static TopoDS_Shape  pickshape;
 static Standard_Real upick,vpick;
-#ifdef WNT
+#ifdef _WIN32
 extern Draw_Viewer dout;
 #endif
 
index ec7013b..0e4c5e2 100644 (file)
@@ -33,7 +33,7 @@
 #include <TCollection_HAsciiString.hxx>
 #include <OSD_File.hxx>
 
-#ifdef WNT
+#ifdef _MSC_VER
 #include <stdio.h>
 #endif
 
index 8fe47f2..de41a79 100644 (file)
@@ -222,7 +222,7 @@ ostream* myOStream;
 
 };
 
-#ifdef WNT
+#ifdef _MSC_VER
 #pragma warning (default : 4275)
 #endif
 
index 91b3967..19b0bfe 100644 (file)
@@ -1232,7 +1232,7 @@ static Standard_Integer DDataStd_KeepUTF (Draw_Interpretor& di,
     DDF::AddLabel(DF, arg[2], L);
     Standard_CString aFileName(arg[3]);
 
-#ifdef WNT
+#ifdef _MSC_VER
       ifstream anIS (aFileName, ios::in | ios::binary);
 #else
       ifstream anIS (aFileName);
@@ -1304,7 +1304,7 @@ static Standard_Integer DDataStd_GetUTFtoFile (Draw_Interpretor& di,
 
     Standard_CString aFileName(arg[3]);
 
-#ifdef WNT
+#ifdef _MSC_VER
     ofstream anOS (aFileName, ios::in | ios::binary | ios::ate);
 #else
     ofstream anOS (aFileName, ios::ate);
index 94eeefc..518d5b3 100644 (file)
@@ -52,7 +52,7 @@
 #include <DDataStd_DrawPresentation.hxx>
 #include <DDataStd_DrawDriver.hxx>
 
-#ifndef WNT
+#ifndef _WIN32
 extern Draw_Viewer dout;
 #else
 Standard_IMPORT Draw_Viewer dout;
index dd19c0e..8867cf2 100644 (file)
@@ -31,7 +31,7 @@
 #include <TDF_RelocationTable.hxx>
 #include <TDF_Tool.hxx>
 
-#ifndef WNT
+#ifndef _WIN32
 extern Draw_Viewer dout;
 #else
 Standard_IMPORT Draw_Viewer dout;
index d834692..d5f0334 100644 (file)
@@ -53,7 +53,7 @@
 #include <gp_Trsf.hxx>
 
 #include <TColStd_HArray1OfInteger.hxx>
-//#ifdef WNT
+//#ifdef _MSC_VER
 #include <stdio.h>
 //#endif
 
index ddf159f..366df6c 100644 (file)
@@ -71,7 +71,7 @@
 #include <DNaming_SphereDriver.hxx>
 #include <DNaming_PointDriver.hxx>
 #include <DNaming_Line3DDriver.hxx>
-#ifdef WNT
+#ifdef _WIN32
 #define EXCEPTION ...
 #else
 #define EXCEPTION Standard_Failure
index 897f1dd..698b09b 100644 (file)
@@ -53,7 +53,7 @@
 #include <TopTools_MapIteratorOfMapOfShape.hxx>
 #include <TopTools_MapOfShape.hxx>
 
-#ifdef WNT
+#ifdef _WIN32
 #define EXCEPTION ...
 #else
 #define EXCEPTION Standard_Failure
index 421f68d..5cfefb5 100644 (file)
@@ -32,7 +32,7 @@
 
 //#include <AppStdL_Application.hxx>
 // avoid warnings on 'extern "C"' functions returning C++ classes
-#ifdef WNT
+#ifdef _MSC_VER
 #pragma warning(4:4190)
 #endif
 //static Handle(AppStdL_Application) stdApp;
index c47ac06..6077ca1 100644 (file)
@@ -14,7 +14,7 @@
  commercial license or contractual agreement.
 */
 
-#ifdef WNT
+#ifdef _WIN32
 
 
 #define COMMANDCLASS "COMMANDWINDOW"
index 347c432..4202791 100644 (file)
@@ -14,7 +14,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#ifdef WNT
+#ifdef _WIN32
 #include <windows.h>
 
 #define COMMANDCLASS "COMMANDWINDOW"
index c1be3ac..f859e9b 100644 (file)
@@ -76,7 +76,7 @@ Standard_EXPORT Standard_Boolean Draw_Interprete(const char* command);
 // *******************************************************************
 // read an init file
 // *******************************************************************
-#ifdef WNT
+#ifdef _WIN32
 extern console_semaphore_value volatile console_semaphore;
 extern char console_command[1000];
 #endif
@@ -84,7 +84,7 @@ extern char console_command[1000];
 static void ReadInitFile (const TCollection_AsciiString& theFileName)
 {
   TCollection_AsciiString aPath = theFileName;
-#ifdef WNT
+#ifdef _WIN32
   if (!Draw_Batch) {
     try {
       aPath.ChangeAll ('\\', '/');
@@ -104,7 +104,7 @@ static void ReadInitFile (const TCollection_AsciiString& theFileName)
     Sprintf (com, "source %s", aPath.ToCString());
     Draw_Interprete (com);
     delete [] com;
-#ifdef WNT
+#ifdef _WIN32
   }
 #endif
 }
@@ -123,7 +123,7 @@ Handle(Draw_ProgressIndicator) Draw::GetProgressBar()
   return PInd;
 }
 
-#ifndef WNT
+#ifndef _WIN32
 /*--------------------------------------------------------*\
 |  exitProc: finalization handler for Tcl/Tk thread. Forces parent process to die
 \*--------------------------------------------------------*/
@@ -254,12 +254,12 @@ void Draw_Appli(Standard_Integer argc, char** argv,const FDraw_InitAppli Draw_In
   // *****************************************************************
   // init X window and create display
   // *****************************************************************
-#ifdef WNT
+#ifdef _WIN32
   HWND hWnd = NULL;
 #endif
 
   if (!Draw_Batch)
-#ifdef WNT
+#ifdef _WIN32
     Draw_Batch=!Init_Appli(hInst, hPrevInst, nShow, hWnd);
 #else
     Draw_Batch=!Init_Appli();
@@ -294,7 +294,7 @@ void Draw_Appli(Standard_Integer argc, char** argv,const FDraw_InitAppli Draw_In
   // *****************************************************************
   Draw_InitAppli(theCommands);
 
-#ifndef WNT
+#ifndef _WIN32
   Tcl_CreateExitHandler(exitProc, 0);
 #endif
 
@@ -307,7 +307,7 @@ void Draw_Appli(Standard_Integer argc, char** argv,const FDraw_InitAppli Draw_In
   {
     if (getenv ("CASROOT") == NULL)
     {
-#ifdef WNT
+#ifdef _WIN32
       ReadInitFile ("ddefault");
 #else
       cout << " the CASROOT variable is mandatory to Run OpenCascade "<< endl;
@@ -331,7 +331,7 @@ void Draw_Appli(Standard_Integer argc, char** argv,const FDraw_InitAppli Draw_In
     ReadInitFile (aRunFile);
     // provide a clean exit, this is useful for some analysis tools
     if ( ! isInteractiveForced )
-#ifndef WNT
+#ifndef _WIN32
       return;
 #else
       ExitProcess(0);
@@ -343,7 +343,7 @@ void Draw_Appli(Standard_Integer argc, char** argv,const FDraw_InitAppli Draw_In
     Draw_Interprete (aCommand.ToCString());
     // provide a clean exit, this is useful for some analysis tools
     if ( ! isInteractiveForced )
-#ifndef WNT
+#ifndef _WIN32
       return;
 #else
       ExitProcess(0);
@@ -354,7 +354,7 @@ void Draw_Appli(Standard_Integer argc, char** argv,const FDraw_InitAppli Draw_In
   // X loop
   // *****************************************************************
   if (XLoop) {
-#ifdef WNT
+#ifdef _WIN32
     Run_Appli(hWnd);
 #else
     Run_Appli(Draw_Interprete);
@@ -372,7 +372,7 @@ void Draw_Appli(Standard_Integer argc, char** argv,const FDraw_InitAppli Draw_In
       cmd[i] = '\0';
     } while (Draw_Interprete(cmd) != (unsigned int ) -2);
   }
-#ifdef WNT
+#ifdef _WIN32
   // Destruction de l'application
   Destroy_Appli(hInst);
 #endif
@@ -491,11 +491,11 @@ void Draw::Load(Draw_Interpretor& theDI, const TCollection_AsciiString& theKey,
     }
 
     TCollection_AsciiString aPluginLibrary("");
-#ifndef WNT
+#ifndef _WIN32
     aPluginLibrary += "lib";
 #endif
     aPluginLibrary +=  aPluginResource->Value(theKey.ToCString());
-#ifdef WNT
+#ifdef _WIN32
     aPluginLibrary += ".dll";
 #elif __APPLE__
     aPluginLibrary += ".dylib";
index 9100a2b..0b542ee 100644 (file)
@@ -14,7 +14,7 @@
  commercial license or contractual agreement.
 */
 
-#ifdef WNT
+#ifdef _MSC_VER
 
 //{{NO_DEPENDENCIES}}
 // Microsoft Developer Studio generated include file.
index 1045022..4df133c 100644 (file)
@@ -29,7 +29,7 @@
 
 typedef void (*FDraw_InitAppli)(Draw_Interpretor&);
 
-#ifdef WNT
+#ifdef _WIN32
 #include <windows.h>
 //extern void Draw_Appli(HINSTANCE,HINSTANCE,LPSTR,int);
 Standard_EXPORT void Draw_Appli(HINSTANCE,HINSTANCE,LPSTR,int,
@@ -41,7 +41,7 @@ extern void Draw_Appli(Standard_Integer argc, char** argv,
 
 
 
-#if defined(WNT) && !defined(HAVE_NO_DLL)
+#if defined(_WIN32) && !defined(HAVE_NO_DLL)
 #ifndef __Draw_API
 # ifdef __Draw_DLL
 #  define __Draw_API __declspec ( dllexport )
@@ -54,7 +54,7 @@ extern void Draw_Appli(Standard_Integer argc, char** argv,
 #endif
 
 
-#ifndef WNT
+#ifndef _WIN32
 extern Draw_Viewer dout;
 extern Standard_Boolean Draw_Batch;
 #endif
index b9ee5b1..e5c8cd8 100644 (file)
@@ -27,9 +27,7 @@
 static Standard_Real MinimumStep = 1.e-3 ;
 static Standard_Real Ratio       = 200.0 ;
 
-//#ifdef WNT
 extern Draw_Viewer dout;
-//#endif
 
 //=======================================================================
 // Function : Draw_Grid
index df09c8b..fef27ed 100644 (file)
@@ -198,7 +198,7 @@ static Standard_Integer CommandCmd
     cout << "An exception was caught " << E << endl;
 
     if (cc && Draw::Atoi(cc)) {
-#ifdef WNT
+#ifdef _WIN32
       Tcl_Exit(0);
 #else      
       Tcl_Eval(interp,"exit");
@@ -566,7 +566,7 @@ Draw_Interpretor::~Draw_Interpretor()
 #endif
   }
 #else
-#ifdef WNT
+#ifdef _WIN32
   Tcl_Exit(0);
 #endif  
 #endif
index c63bc69..66b5168 100644 (file)
@@ -53,7 +53,7 @@
 
 #include <tcl.h>
 
-#ifdef WNT
+#ifdef _WIN32
 #include <sys/stat.h>
 #include <Draw_Window.hxx>
 
@@ -78,7 +78,7 @@ Standard_IMPORT Standard_Boolean Draw_Interprete(const char* command); //for C30
 static FDraw_InitAppli theDraw_InitAppli; //pointer to the Draw_InitAppli
 #endif
 
-#ifdef WNT
+#ifdef _WIN32
 //=======================================================================
 //NOTE: OCC11
 //     On Windows NT, both console (UNIX-like) and windowed (classical on 
index ce693a6..79c6d1a 100644 (file)
@@ -30,7 +30,7 @@
 
 typedef void (*FDraw_InitAppli)(Draw_Interpretor&);
 
-#ifndef WNT
+#ifndef _WIN32
 Standard_EXPORT Standard_Integer _main_ (Standard_Integer argc, 
                                         Standard_PCharacter argv[], 
                                         const FDraw_InitAppli Draw_InitAppli);
@@ -49,7 +49,7 @@ Standard_EXPORT Standard_Integer _main_ (int argc,
 #endif
 
 // Declarations of macros DRAW_MAIN to be used in executables instead of explicit main/WinMain
-#ifndef WNT
+#ifndef _WIN32
 // main()
 #define DRAW_MAIN int main (Standard_Integer argc, char* argv[])\
 {return _main_ (argc, argv, Draw_InitAppli);}
index 430a48e..9f5f031 100644 (file)
@@ -114,7 +114,7 @@ void Draw_Viewer::MakeView(const Standard_Integer id,
   }
 }
 
-#ifdef WNT
+#ifdef _WIN32
 //=======================================================================
 //function : MakeView
 //purpose  :
@@ -590,7 +590,7 @@ void Draw_Viewer::RepaintView (const Standard_Integer id) const
 }
 
 
-#ifdef WNT
+#ifdef _WIN32
 //=======================================================================
 //function : ResizeView
 //purpose  : WNT re-drawing optimization
index 0c2b846..c6a80b6 100644 (file)
@@ -29,7 +29,7 @@
 #include <Draw_SequenceOfDrawable3D.hxx>
 #include <Draw_Color.hxx>
 
-#ifdef WNT
+#ifdef _WIN32
 #include <windows.h>
 #if !defined(__Draw_API) && !defined(HAVE_NO_DLL)
 # ifdef __Draw_DLL
@@ -56,7 +56,7 @@ class Draw_Viewer {
                                 const Standard_Integer X, const Standard_Integer Y, 
                                 const Standard_Integer W, const Standard_Integer H);
   // build a view on a given window
-#ifdef WNT
+#ifdef _WIN32
   __Draw_API void MakeView    (const Standard_Integer id,
                               const char*   typ,
                               const Standard_Integer X, const Standard_Integer Y,
@@ -108,7 +108,7 @@ class Draw_Viewer {
   __Draw_API void   ClearView   (const Standard_Integer id) const;
   __Draw_API void   RemoveView  (const Standard_Integer id) ;
   __Draw_API void   RepaintView (const Standard_Integer id) const;
-#ifdef WNT
+#ifdef _WIN32
   __Draw_API void   ResizeView  (const Standard_Integer id) const;
   __Draw_API void   UpdateView  (const Standard_Integer id, const Standard_Boolean forced = Standard_False) const;
 #endif  
index ddebf5a..918465d 100644 (file)
@@ -15,7 +15,7 @@
 // commercial license or contractual agreement.
 
 // include windows.h first to have all definitions available
-#ifdef WNT
+#ifdef _WIN32
 #include <windows.h>
 #endif
 
index 72dda55..c894bd4 100644 (file)
@@ -19,7 +19,7 @@
 /**  MainWindow.h
 */ 
 /*\****************************************************/ 
-#ifdef WNT
+#ifdef _WIN32
 
 #define CLIENTWND 0
 
index e3ce014..b188bbb 100644 (file)
@@ -14,7 +14,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#ifdef WNT
+#ifdef _WIN32
 
 #include <windows.h>
 #include <DrawRessource.h>
index 72806e1..aea8e87 100644 (file)
@@ -14,7 +14,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#ifdef WNT
+#ifdef _WIN32
 
 // include windows.h first to have all definitions available
 #include <windows.h>
index e18aa60..4e41748 100644 (file)
@@ -14,7 +14,7 @@
  commercial license or contractual agreement.
 */
 
-#ifdef WNT
+#ifdef _WIN32
 
 #define APPCLASS "TDRAW"
 #define APPTITLE "Windows NT TDRAW"
index 0ff9f21..b2a86de 100644 (file)
@@ -39,7 +39,7 @@
 #include <TopoDS_Shape.hxx>
 #include <TopoDS_Vertex.hxx>
 
-#ifdef WNT
+#ifdef _WIN32
 Standard_IMPORT Draw_Viewer dout;
 #endif
 
index 3773251..2451353 100644 (file)
@@ -42,7 +42,7 @@
 #include <gp_Ax3.hxx>
 #include <gp_Pln.hxx>
 #include <DrawTrSurf.hxx>
-#ifdef WNT
+#ifdef _MSC_VER
 #include <stdio.h>
 #endif
 //=======================================================================
index a812716..217a514 100644 (file)
@@ -29,8 +29,6 @@
 #include <TColStd_Array1OfInteger.hxx>
 
 #include <stdio.h>
-//#ifdef WNT
-//#endif
 //=======================================================================
 //function : DrawTrSurf_Triangulation
 //purpose  : 
index 963b47c..727085d 100644 (file)
@@ -29,7 +29,7 @@
 #include <TColgp_Array1OfPnt2d.hxx>
 #include <TColStd_Array1OfInteger.hxx>
 
-#ifdef WNT
+#ifdef _MSC_VER
 #include <stdio.h>
 #endif
 
index 032b4d6..feedd30 100644 (file)
@@ -46,9 +46,6 @@
 #include <TCollection_ExtendedString.hxx>
 
 #include <stdio.h>
-//pop pour NT
-//#if WNT
-//#endif
 //=======================================================================
 //function : Add
 //purpose  : 
index af068c5..5451e58 100644 (file)
@@ -26,7 +26,7 @@
 #include <Expr_Division.hxx>
 
 #ifndef __Expr_API
-# if defined(WNT) && !defined(HAVE_NO_DLL)
+# if defined(_WIN32) && !defined(HAVE_NO_DLL)
 #  ifdef __Expr_DLL
 #   define __Expr_API __declspec( dllexport )
 #  else
@@ -34,7 +34,7 @@
 #  endif  // __Expr_DLL
 # else
 #   define __Expr_API
-# endif  // WNT
+# endif  // _WIN32
 #endif  // __Expr_API
 
 //__Expr_API Handle(Expr_Sum) operator+(const Handle(Expr_GeneralExpression)& x,const Handle(Expr_GeneralExpression)& y);
index 89008bf..8ab0eac 100644 (file)
@@ -20,7 +20,7 @@
 #include <ExprIntrp_Analysis.hxx>
 
 #ifndef _ExprIntrp_API
-# if !defined(WNT) || defined(__ExprIntrp_DLL) || defined(__Expr_DLL) || defined(__ExprIntrp_DLL) || defined(__math_DLL) || defined(__MathBase_DLL) || defined(__ElCLib_DLL) || defined(__ElSLib_DLL) || defined(__BSplCLib_DLL) || defined(__BSplSLib_DLL) || defined(__Smoothing_DLL) || defined(__SysBase_DLL) || defined(__Data_DLL) || defined(__PLib_DLL) || defined(__GeomAbs_DLL) || defined(__Poly_DLL) || defined(__CSLib_DLL) || defined(__Convert_DLL) || defined(__Bnd_DLL) || defined(__gp_DLL) || defined(__TColgp_DLL)
+# if !defined(_WIN32) || defined(__ExprIntrp_DLL) || defined(__Expr_DLL) || defined(__ExprIntrp_DLL) || defined(__math_DLL) || defined(__MathBase_DLL) || defined(__ElCLib_DLL) || defined(__ElSLib_DLL) || defined(__BSplCLib_DLL) || defined(__BSplSLib_DLL) || defined(__Smoothing_DLL) || defined(__SysBase_DLL) || defined(__Data_DLL) || defined(__PLib_DLL) || defined(__GeomAbs_DLL) || defined(__Poly_DLL) || defined(__CSLib_DLL) || defined(__Convert_DLL) || defined(__Bnd_DLL) || defined(__gp_DLL) || defined(__TColgp_DLL)
 #  define __ExprIntrp_API Standard_EXPORT
 #  define __ExprIntrp_APIEXTERN Standard_EXPORTEXTERN
 # else
index 596ed77..76079a2 100644 (file)
 static TCollection_AsciiString ExprIntrp_curres;
 static int ExprIntrp_degree;
 
-#ifndef WNT
+#ifndef _WIN32
 extern char* ExprIntrptext;
 #else
 extern "C" char* ExprIntrptext;
-#endif  // WNT
+#endif  // _WIN32
 
 
 extern "C" void ExprIntrp_SetResult()
index 0ac7fbe..fa1f37b 100644 (file)
 
 #include <stdio.h>
 
-#ifdef WNT
+#ifdef _MSC_VER
 # include <stdlib.h>
 # include <io.h>
-#endif  /* WNT */
+#endif  /* _MSC_VER */
 
 
 
index 1f9c092..87cfdc2 100644 (file)
@@ -298,7 +298,7 @@ Handle(IGESData_IGESEntity) GeomToIGES_GeomSurface::TransferSurface(const Handle
         }
       }
       catch ( Standard_Failure ) {
-        #ifdef DEB
+        #ifdef OCCT_DEBUG
         cout << "Warning: GeomToIGES_GeomSurface: can't trim bspline" << endl;
         cout << "Warning: Exception in Segment(): " ;
         Standard_Failure::Caught()->Print(cout);
index fb0a522..5210f6f 100644 (file)
@@ -36,7 +36,7 @@
 #include <GeomAbs_Shape.hxx>
 
 #include <stdio.h>
-#ifdef WNT
+#ifdef _WIN32
 Standard_IMPORT Draw_Viewer dout;
 #endif
 
index e5e6c23..dbc77b2 100644 (file)
@@ -39,7 +39,7 @@
 #include <TColStd_Array2OfReal.hxx>
 #include <Precision.hxx>
 #include <stdio.h>
-#ifdef WNT
+#ifdef _WIN32
 Standard_IMPORT Draw_Viewer dout;
 #endif
 
index cf647cc..204fe3d 100644 (file)
@@ -64,9 +64,8 @@
 #include <GC_MakeSegment.hxx>
 #include <GC_MakeArcOfCircle.hxx>
 
-//#ifdef WNT
 #include <stdio.h>
-#ifdef WNT
+#ifdef _WIN32
 Standard_IMPORT Draw_Viewer dout;
 #endif
 Standard_IMPORT Draw_Color DrawTrSurf_CurveColor(const Draw_Color);
index 03004ff..2ff026b 100644 (file)
 #include <GCPnts_UniformAbscissa.hxx>
 #include <DBRep.hxx>
 
-#ifdef WNT
+#ifdef _WIN32
 Standard_IMPORT Draw_Viewer dout;
 #endif
 
index 66c5a48..5eaabdb 100644 (file)
@@ -29,7 +29,7 @@
 #include <TColgp_Array1OfPnt.hxx>
 #include <TColgp_Array1OfPnt2d.hxx>
 
-#ifdef WNT
+#ifdef _WIN32
 Standard_IMPORT Draw_Viewer dout;
 #endif
 //=======================================================================
index 2e6ea7d..b378b57 100644 (file)
 #include <DrawTrSurf_BezierSurface.hxx>
 #include <DrawTrSurf_BSplineSurface.hxx>
 
-#ifdef WNT
+#ifdef _MSC_VER
 #include <stdio.h>
 //#define strcasecmp strcmp Already defined
+#endif
+
+#ifdef _WIN32
 Standard_IMPORT Draw_Viewer dout;
 #endif
 
index cfbb43e..5ec57e0 100644 (file)
@@ -27,7 +27,7 @@
 #include <Draw_Marker3D.hxx>
 
 #include <stdio.h>
-#ifdef WNT
+#ifdef _WIN32
 Standard_IMPORT Draw_Viewer dout;
 #endif
 
index e499762..084c495 100644 (file)
@@ -44,7 +44,7 @@
 #include <IntRes2d_IntersectionPoint.hxx>
 
 #include <stdio.h>
-#ifdef WNT
+#ifdef _WIN32
 Standard_IMPORT Draw_Viewer dout;
 #endif
 
index b192502..5568d00 100644 (file)
 #include <AppDef_Array1OfMultiPointConstraint.hxx>
 #include <math_Vector.hxx>
 
-#ifdef WNT
+#ifdef _MSC_VER
 #include <stdio.h>
+#endif
+
+#ifdef _WIN32
 Standard_IMPORT Draw_Viewer dout;
 #endif
 
index 54f44e5..1610867 100644 (file)
 #include <Approx_CurvilinearParameter.hxx>
 #include <Approx_CurveOnSurface.hxx>
 #include <Geom_BSplineSurface.hxx>
-#ifdef WNT
+#ifdef _WIN32
 Standard_IMPORT Draw_Viewer dout;
 #endif
 
index 68dbea0..1c649ca 100644 (file)
@@ -33,7 +33,7 @@
 #include <Geom_BoundedCurve.hxx>
 #include <Geom_BoundedSurface.hxx>
 
-#ifdef WNT
+#ifdef _MSC_VER
 #include <stdio.h>
 //#define strcasecmp strcmp Already defined
 #endif
index 174c2c0..edbf114 100644 (file)
 #include <DBRep.hxx>
 #include <Geom_Curve.hxx>
 
-//#ifdef WNT
 #include <stdio.h>
 #ifdef _WIN32
-//#define strcasecmp strcmp Already defined
 Standard_IMPORT Draw_Viewer dout;
 #endif
 
index 5dab025..bc6e174 100644 (file)
@@ -31,7 +31,7 @@
 #include <TopoDS_Shape.hxx>
 
 static Handle(HLRBRep_Algo) hider;
-#ifdef WNT
+#ifdef _WIN32
 Standard_IMPORT Draw_Viewer dout;
 #endif
 
index 091f8a8..755669c 100644 (file)
@@ -62,7 +62,7 @@
 
 #include <stdio.h>
 //#include <ShapeCustom.hxx>
-#ifdef WNT
+#ifdef _MSC_VER
 #include <stdlib.h>
 #else
 #include <errno.h>
index 3de2e98..650ac1a 100644 (file)
@@ -15,7 +15,7 @@
 #include <gp_Vec.hxx>
 #include <IntImp_ConstIsoparametric.hxx>
 
-#if !defined(WNT) || defined(__ApproxInt_DLL) || defined(__IntImp_DLL) || defined(__IntWalk_DLL) || defined(__GeomInt_DLL) || defined(__IntPatch_DLL)
+#if !defined(_WIN32) || defined(__ApproxInt_DLL) || defined(__IntImp_DLL) || defined(__IntWalk_DLL) || defined(__GeomInt_DLL) || defined(__IntPatch_DLL)
  Standard_EXPORTEXTERN const IntImp_ConstIsoparametric  *ChoixRef;
 #else
  Standard_IMPORT const IntImp_ConstIsoparametric  *ChoixRef;
index 97953ee..ecaf16f 100644 (file)
@@ -377,6 +377,6 @@ namespace {
   return 1;
 }
 
-#ifdef WNT
+#ifdef _MSC_VER
 #pragma warning ( default : 4101 )
 #endif
index afc0922..a03518e 100644 (file)
@@ -1545,6 +1545,6 @@ Standard_Integer AdaptiveDiscret (const Standard_Integer iDiscret,
 }
 
 
-#ifdef WNT
+#ifdef _MSC_VER
 #pragma warning ( default : 4101 )
 #endif
index ff9b924..47ad1d8 100644 (file)
@@ -32,7 +32,7 @@
 #include <Standard_Transient.hxx>
 #include <TCollection_HAsciiString.hxx>
 
-#ifdef WNT
+#ifdef _WIN32
 #include <OSD_Exception.hxx>
 #else
 #include <OSD_Signal.hxx>
@@ -49,7 +49,7 @@ static void raisecheck (Handle(Interface_Check)& ach)
   sprintf (mess,"** Exception Raised during Check : %s **",
           afail->DynamicType()->Name());
   ach->AddFail(mess);
-#ifdef WNT
+#ifdef _WIN32
   if (afail->IsKind(STANDARD_TYPE(OSD_Exception)))
 #else
   if (afail->IsKind(STANDARD_TYPE(OSD_Signal)))
index 2fa4473..7f0edbe 100644 (file)
@@ -36,7 +36,7 @@
 #include <Standard_Transient.hxx>
 #include <Standard_TypeMismatch.hxx>
 
-#ifdef WNT
+#ifdef _WIN32
 #include <OSD_Exception.hxx>
 #else
 #include <OSD_Signal.hxx>
@@ -385,7 +385,7 @@ void Interface_FileReaderTool::LoadModel
       num0 = thereader->FindNextRecord(num); //:g9 abv 28 May 98: tr8_as2_ug.stp - infinite cycle: (0);
 
       Handle(Standard_Failure) afail = Standard_Failure::Caught();
-#ifdef WNT
+#ifdef _WIN32
       if (afail.IsNull() || afail->IsKind(STANDARD_TYPE(OSD_Exception))) ierr = 2;
 #else
       if (afail.IsNull() || afail->IsKind(STANDARD_TYPE(OSD_Signal))) ierr = 2;
index f561340..c30b3f1 100644 (file)
@@ -317,7 +317,7 @@ Standard_Boolean LDOMBasicString::GetInteger (Standard_Integer& aResult) const
 }
 
 #ifdef OCCT_DEBUG
-#ifndef WNT
+#ifndef _MSC_VER
 //=======================================================================
 // Debug Function for DBX: use "print -p <Variable> or pp <Variable>"
 //=======================================================================
index 0d28c7b..432aaf4 100644 (file)
@@ -26,7 +26,7 @@
 #include <TCollection_ExtendedString.hxx>
 
 #include <fcntl.h>
-#ifdef WNT
+#ifdef _MSC_VER
 #include <io.h>
 #else
 #include <unistd.h>
@@ -63,7 +63,7 @@ inline
 #ifdef LDOM_PARSER_TRACE
   static FILE * ff = NULL;
   TCollection_AsciiString aTraceFileName;
-#ifdef WNT
+#ifdef _WIN32
   aTraceFileName = TCollection_AsciiString (getenv("TEMP")) + "\\ldom.trace";
 #else
   aTraceFileName = "/tmp/ldom.trace";
index cdd57ea..5d6ee63 100644 (file)
@@ -45,7 +45,7 @@ const LDOM_BasicNode * LDOM_BasicNode::GetSibling () const
 }
 
 #ifdef OCCT_DEBUG
-#ifndef WNT
+#ifndef _MSC_VER
 //=======================================================================
 // Debug Function for DBX: use "print -p <Variable> or pp <Variable>"
 //=======================================================================
index a4a5f11..6e4d8a6 100644 (file)
@@ -25,7 +25,7 @@
 
 #include <string.h>
 #include <errno.h>
-#ifdef WNT
+#ifdef _MSC_VER
 #include <io.h>
 #else
 #include <unistd.h>
index bf09685..2c10b63 100644 (file)
@@ -409,7 +409,7 @@ LDOM_XmlWriter& LDOM_XmlWriter::operator<<     (const LDOM_Node& theNodeToWrite)
       break;
     }
   default:
-#ifndef WNT
+#ifndef _MSC_VER
       cerr << "Unrecognized node type = "
         << (long)theNodeToWrite.getNodeType() << endl
 #endif
index 81ecf09..30b0601 100644 (file)
 //function : HashCode
 //purpose  : 
 //=======================================================================
-//#ifndef WNT
-//inline  static Standard_Integer  MAT2d_MapBiIntHasher::HashCode
-//(const MAT2d_BiInt& Key1, const Standard_Integer upper)
-//{
-//  return TColStd_MapIntegerHasher::HashCode(Key1.FirstIndex(),upper);
-//}
-//#else
 inline Standard_Integer  MAT2d_MapBiIntHasher::HashCode
 (const MAT2d_BiInt& Key1, const Standard_Integer upper)
 {
   return TColStd_MapIntegerHasher::HashCode(Key1.FirstIndex(),upper);
 }
-//#endif
 
 //=======================================================================
 //function : IsEqual
 //purpose  : 
 //=======================================================================
-//#ifndef WNT
-//inline  static Standard_Boolean  MAT2d_MapBiIntHasher::IsEqual
-//  (const MAT2d_BiInt& Key1,
-//   const MAT2d_BiInt& Key2)
-//{
-//  return (Key1 == Key2);
-//}
-//#else
 inline Standard_Boolean  MAT2d_MapBiIntHasher::IsEqual
 (const MAT2d_BiInt& Key1,
  const MAT2d_BiInt& Key2)
 {
   return (Key1 == Key2);
 }
-//#endif
index 58e9607..3800fb2 100644 (file)
@@ -84,7 +84,7 @@
 #include <stdio.h>
 //epa Memory leaks test
 //OAN: for triepoints
-#ifdef WNT
+#ifdef _WIN32
 Standard_IMPORT Draw_Viewer dout;
 #endif
 
index e9ab616..7793861 100644 (file)
@@ -161,7 +161,7 @@ void MeshVS_TextPrsBuilder::Build ( const Handle(Prs3d_Presentation)& Prs,
   Handle (Graphic3d_Group) aTextGroup = Prs3d_Root::CurrentGroup ( Prs );
 
   Quantity_Color           AColor           = Quantity_NOC_YELLOW;
-#ifdef WNT  
+#ifdef _WIN32  
   Standard_CString         AFont            = "Courier New";
 #else
   Standard_CString         AFont            = "Courier";
index ef6163d..48320b8 100644 (file)
@@ -63,7 +63,7 @@ Standard_Boolean Message_MsgFile::Load (const Standard_CString theDirName,
   {
     TCollection_AsciiString aFileName = aDirList.Token (" \t\n", i);
     if (aFileName.IsEmpty()) break;
-#ifdef WNT
+#ifdef _WIN32
     aFileName += '\\';
 #else
     aFileName += '/';
index a43b9b4..66ec9ca 100644 (file)
@@ -68,7 +68,7 @@ Standard_Boolean OSD::CStringToReal(const Standard_CString aString,
 //purpose  : Cause the process to sleep during a amount of seconds 
 //=======================================================================
 
-#ifdef WNT
+#ifdef _WIN32
 # include <Windows.h>
 #if !defined(__CYGWIN32__) && !defined(__MINGW32__)
 //# include <Mapiwin.h>
@@ -214,7 +214,7 @@ Standard_Integer OSD::AvailableMemory()
 #  define SIZE_MAX  0x7fffffff
 # elif defined(__osf__)  || defined(DECOSF1)        
 #  define SIZE_MAX  0x10000000000 
-# elif defined(WNT)
+# elif defined(_WIN32)
 #  define SIZE_MAX 0x7ffdefff
 # else
 #  define SIZE_MAX  0xffffffff
index d45d0a9..509aee6 100644 (file)
@@ -19,7 +19,7 @@
 #include <Standard_Stream.hxx>
 
 // ====================== PLATFORM-SPECIFIC PART ========================
-#ifndef WNT
+#ifndef _WIN32
 
 //---------- Systemes autres que WNT : ----------------------------------
 
@@ -57,7 +57,7 @@
 //=======================================================================
 void OSD_Chronometer::GetProcessCPU (Standard_Real& UserSeconds, Standard_Real& SystemSeconds)
 {
-#if defined(LIN) || defined(linux) || defined(__FreeBSD__) || defined(__ANDROID__)
+#if defined(__linux__) || defined(linux) || defined(__FreeBSD__) || defined(__ANDROID__)
   static const long aCLK_TCK = sysconf(_SC_CLK_TCK);
 #else
   static const long aCLK_TCK = CLK_TCK;
@@ -154,7 +154,7 @@ void OSD_Chronometer::GetThreadCPU (Standard_Real& UserSeconds, Standard_Real& S
   SystemSeconds = 0.0000001 * EncodeFILETIME (&ftKernel);
 }
 
-#endif /* WNT */
+#endif /* _WIN32 */
 
 // ====================== PLATFORM-INDEPENDENT PART ========================
 
index 34708bc..ed5c03c 100644 (file)
@@ -12,7 +12,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#ifndef WNT
+#ifndef _WIN32
 
 
 #include <OSD_Directory.hxx>
index d1ca52b..b5f1c5d 100644 (file)
@@ -12,7 +12,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#ifndef WNT
+#ifndef _WIN32
 
 
 #include <OSD_Directory.hxx>
index d1832f5..fdc9638 100644 (file)
@@ -12,7 +12,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#ifndef WNT
+#ifndef _WIN32
 
 
 #include <OSD_Environment.hxx>
index 8b2b4a2..d805237 100755 (executable)
@@ -12,7 +12,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#ifndef WNT
+#ifndef _WIN32
 
 
 #include <OSD_Error.hxx>
index 174a4c1..c5b32d9 100644 (file)
@@ -12,7 +12,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#ifndef WNT
+#ifndef _WIN32
 
 
 #include <OSD_File.hxx>
index e71caa9..fbba834 100644 (file)
@@ -12,7 +12,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#ifndef WNT
+#ifndef _WIN32
 
 
 #include <OSD_Host.hxx>
index 81dd2d6..f5f8a8e 100644 (file)
@@ -15,7 +15,7 @@
 
 #include <OSD_MAllocHook.hxx>
 
-#ifndef WNT
+#ifndef _MSC_VER
 #if !defined __STDC_LIMIT_MACROS
 #define __STDC_LIMIT_MACROS
 #endif
@@ -82,7 +82,7 @@ OSD_MAllocHook::CollectBySize* OSD_MAllocHook::GetCollectBySize()
 // Platform-dependent methods
 //!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
-#ifdef WNT
+#ifdef _MSC_VER
 #include <crtdbg.h>
 
 #if _MSC_VER >= 1500  /* VS 2008 */
@@ -174,7 +174,7 @@ void OSD_MAllocHook::SetCallback(Callback* theCB)
     _CrtSetAllocHook(MyAllocHook);
 }
 
-#else // ! WNT
+#else // ! _MSC_VER
 
 // Not yet implemented for non-WNT platform
 
@@ -183,7 +183,7 @@ void OSD_MAllocHook::SetCallback(Callback* theCB)
   MypCurrentCallback = theCB;
 }
 
-#endif // WNT
+#endif // _MSC_VER
 
 //!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 // LogFileHandler handler methods
index dcd8cbd..ddc83f8 100644 (file)
@@ -18,7 +18,7 @@
 
 // Platform-dependent definition of the thread handle type
 
-#ifdef WNT
+#ifdef _WIN32
 
 #include <windows.h>
 typedef HANDLE OSD_PThread;
index f324bed..cb9f999 100644 (file)
@@ -43,7 +43,7 @@ static OSD_SysType whereAmI(){
 #elif defined(vax) || defined(__vms)
   return OSD_VMS;
 }
-#elif defined(__linux__) || defined(LIN)
+#elif defined(__linux__) || defined(__linux)
   return OSD_LinuxREDHAT;
 }
 #elif defined(_AIX) || defined(AIX)
index 94f67b5..91dad41 100644 (file)
@@ -12,7 +12,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#ifndef WNT
+#ifndef _WIN32
 
 
 #include <OSD_OSDError.hxx>
index 1c620c6..9eb168b 100644 (file)
@@ -12,7 +12,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#ifndef WNT
+#ifndef _WIN32
 
 
 #include <OSD_Environment.hxx>
index 17d2c2d..69816a4 100644 (file)
@@ -12,7 +12,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#ifndef WNT
+#ifndef _WIN32
 
 
 #include <OSD_Directory.hxx>
index 90e4ac9..aa5d472 100644 (file)
@@ -12,7 +12,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#ifndef WNT
+#ifndef _WIN32
 
 
 #include <OSD_Function.hxx>
index 96c631e..35f2a08 100644 (file)
@@ -51,7 +51,7 @@ void OSD_Thread::Assign (const OSD_Thread &other)
   myFunc = other.myFunc;
   myPriority = other.myPriority;
 
-#ifdef WNT
+#ifdef _WIN32
 
   // On Windows, close current handle 
   if ( myThread ) 
@@ -81,7 +81,7 @@ void OSD_Thread::Assign (const OSD_Thread &other)
 
 void OSD_Thread::Destroy ()
 {
-#ifdef WNT
+#ifdef _WIN32
 
   // On Windows, close current handle 
   if ( myThread ) 
@@ -105,7 +105,7 @@ void OSD_Thread::Destroy ()
 void OSD_Thread::SetPriority (const Standard_Integer thePriority)
 {
   myPriority = thePriority;
-#ifdef WNT
+#ifdef _WIN32
   if (myThread)
     SetThreadPriority (myThread, thePriority);
 #endif
@@ -126,7 +126,7 @@ void OSD_Thread::SetFunction (const OSD_ThreadFunction &func)
 // OSD_Thread::Run
 //=============================================
 
-#ifdef WNT
+#ifdef _WIN32
 #include <malloc.h>
 // On Windows the signature of the thread function differs from that on UNIX/Linux.
 // As we use the same definition of the thread function on all platforms (POSIX-like),
@@ -142,7 +142,7 @@ static DWORD WINAPI WNTthread_func (LPVOID data)
 #endif
 
 Standard_Boolean OSD_Thread::Run (const Standard_Address data, 
-#ifdef WNT
+#ifdef _WIN32
                                   const Standard_Integer WNTStackSize
 #else
                                   const Standard_Integer
@@ -153,7 +153,7 @@ Standard_Boolean OSD_Thread::Run (const Standard_Address data,
 
   myThreadId = 0;
 
-#ifdef WNT
+#ifdef _WIN32
 
   // On Windows, close current handle if open
   if ( myThread ) 
@@ -195,7 +195,7 @@ Standard_Boolean OSD_Thread::Run (const Standard_Address data,
 
 void OSD_Thread::Detach ()
 {
-#ifdef WNT
+#ifdef _WIN32
 
   // On Windows, close current handle 
   if ( myThread ) 
@@ -234,7 +234,7 @@ Standard_Boolean OSD_Thread::Wait (Standard_Address &result) const
   if ( ! myThread ) 
     return Standard_False;
 
-#ifdef WNT
+#ifdef _WIN32
 
   // On Windows, wait for the thread handle to be signaled
   if ( WaitForSingleObject ( myThread, INFINITE ) != WAIT_OBJECT_0 ) 
@@ -265,7 +265,7 @@ Standard_Boolean OSD_Thread::Wait (const Standard_Integer time, Standard_Address
   if ( ! myThread ) 
     return Standard_False;
 
-#ifdef WNT
+#ifdef _WIN32
 
   // On Windows, wait for the thread handle to be signaled
   DWORD ret = WaitForSingleObject ( myThread, time );
@@ -306,7 +306,7 @@ Standard_ThreadId OSD_Thread::GetId () const
 
 Standard_ThreadId OSD_Thread::Current () 
 {
-#ifdef WNT
+#ifdef _WIN32
   return GetCurrentThreadId();
 #else
   return pthread_self();
index 0a42eda..2fd6c52 100644 (file)
@@ -31,7 +31,7 @@
 // that the thread function returns just integer (casted to void*). 
 // This shall work on all platforms.
 
-//#ifdef WNT
+//#ifdef _WIN32
 //#include <windows.h>
 //typedef LPTHREAD_START_ROUTINE OSD_ThreadFunction;
 //#else
index 4a7b83e..b011a4f 100644 (file)
@@ -21,7 +21,7 @@
 
 #include <OSD_Timer.hxx>
 
-#ifndef WNT
+#ifndef _WIN32
 
 //---------- No Windows NT Systems ----------------------------------
 
@@ -65,7 +65,7 @@ static inline Standard_Real GetWallClockTime ()
          0.001 * GetTickCount();
 }
 
-#endif /* WNT */
+#endif /* _WIN32 */
 
 // ====================== PLATFORM-INDEPENDENT PART ========================
 
index 8ae67d1..06b9b23 100644 (file)
@@ -13,7 +13,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#ifdef WNT
+#ifdef _WIN32
 
 /******************************************************************************/
 /* File:      OSD_WNT.cxx                                                     */
index c513375..8ccfa63 100644 (file)
 #ifndef __OSD_WNT_BREAK_HXX
 # define __OSD_WNT_BREAK_HXX
 
-# ifdef WNT
+# ifdef _WIN32
 #  include <OSD.hxx>
 #  define _TSTBRK() OSD :: ControlBreak ()
-# endif  // WNT
+# endif  // _WIN32
 
 #endif  // __OSD_WNT_BREAK_HXX
 
index 8a87e3d..9046a67 100644 (file)
@@ -513,7 +513,7 @@ void OSD::SetSignal(const Standard_Boolean aFloatingSignal)
        sigaction(SIGBUS,&oact,&oact);
 #endif
 
-#if (!defined (linux)) && (!defined(LININTEL))
+#if (!defined (linux)) && (!defined(__linux__))
   sigaction(SIGSYS,&act,&oact);   // ...... bad argument to system call
 
 # ifdef OBJS
index 4347cd1..1636613 100644 (file)
@@ -598,4 +598,4 @@ LONG _osd_debug ( void ) {
 #undef __finally
 #undef __leave
 #endif
-#endif // WNT
+#endif // _WIN32
index 2d0af0f..ba4d397 100644 (file)
@@ -16,7 +16,7 @@
 #ifndef __OPENGL_AVIWRITER_H
 #define __OPENGL_AVIWRITER_H
 
-#ifdef WNT
+#ifdef _MSC_VER
 #define THIS void 
 
 #include <InterfaceGraphic.hxx>
@@ -185,5 +185,5 @@ Standard_EXPORT void OpenGl_AVIWriter_AVIWriter(void * pp,
 
 Standard_EXPORT Standard_Boolean OpenGl_AVIWriter_AllowWriting(void * hWin);
 
-#endif // WNT
+#endif // _MSC_VER
 #endif
index 4d99800..0572c09 100644 (file)
@@ -457,7 +457,7 @@ OpenGl_Window::OpenGl_Window (const Handle(OpenGl_GraphicDriver)& theDriver,
     aVis = XGetVisualInfo (aDisp, aVisInfoMask, &aVisInfo, &aNbItems);
   }
 
-#if defined(__linux) || defined(Linux) || defined(__APPLE__)
+#if defined(__linux__) || defined(Linux) || defined(__APPLE__)
   if (aVis != NULL)
   {
     // check Visual for OpenGl context's parameters compatibility
index f0081f3..3234483 100644 (file)
@@ -54,7 +54,7 @@ static Standard_Integer RemoveExtraSeparator(TCollection_AsciiString& aString) {
   Standard_Integer i, j, len ;
 
   len = aString.Length() ;
-#ifdef WNT
+#ifdef _WIN32
   // Case of network path, such as \\MACHINE\dir
   for (i = j = 2 ; j <= len ; i++,j++) {
 #else
@@ -75,7 +75,7 @@ static TCollection_AsciiString AbsolutePath(
                             const TCollection_AsciiString& aRelFilePath)
 {
   TCollection_AsciiString EmptyString = "" ;
-#ifdef WNT
+#ifdef _WIN32
   if (aRelFilePath.Search(":") == 2 ||
       (aRelFilePath.Search("\\") == 1 && aRelFilePath.Value(2) == '\\'))
 #else
@@ -86,7 +86,7 @@ static TCollection_AsciiString AbsolutePath(
   TCollection_AsciiString DirPath = aDirPath, RelFilePath = aRelFilePath  ;
   Standard_Integer i,len ;
   
-#ifdef WNT
+#ifdef _WIN32
   if(DirPath.Search(":") != 2 &&
      (DirPath.Search("\\") != 1 || DirPath.Value(2) != '\\'))
 #else
@@ -94,7 +94,7 @@ static TCollection_AsciiString AbsolutePath(
 #endif
     return EmptyString ;
 
-#ifdef WNT
+#ifdef _WIN32
   DirPath.ChangeAll('\\','/') ;
   RelFilePath.ChangeAll('\\','/') ;      
 #endif
@@ -125,7 +125,7 @@ static TCollection_AsciiString GetDirFromFile(const TCollection_ExtendedString&
   TCollection_AsciiString theCFile(aFileName);
   TCollection_AsciiString theDirectory;
   Standard_Integer i=theCFile.SearchFromEnd("/");
-#ifdef WNT    
+#ifdef _WIN32    
 //    if(i==-1) i=theCFile.SearchFromEnd("\\");
   if(theCFile.SearchFromEnd("\\") > i)
     i=theCFile.SearchFromEnd("\\");
index 0b80250..79b0d8e 100644 (file)
@@ -27,9 +27,9 @@
 #include <Storage_Data.hxx>
 #include <UTL.hxx>
 
-#ifdef WNT
+#ifdef _MSC_VER
 # include <tchar.h>
-#endif  // WNT
+#endif  // _MSC_VER
 
 //=======================================================================
 //function : PCDM_ReferenceIterator
@@ -99,7 +99,7 @@ Handle(CDM_MetaData) PCDM_ReferenceIterator::MetaData(const Standard_Boolean ) c
   TCollection_ExtendedString theFolder,theName;
   TCollection_ExtendedString theFile=myReferences(myIterator).FileName();
   TCollection_ExtendedString f(theFile);
-#ifndef WNT
+#ifndef _WIN32
   
   Standard_Integer i= f.SearchFromEnd("/");
   TCollection_ExtendedString n = f.Split(i); 
@@ -136,7 +136,7 @@ Handle(CDM_MetaData) PCDM_ReferenceIterator::MetaData(const Standard_Boolean ) c
   }
   theFolder = dirRet;
   theName   = UTL::Name(p); theName+= UTL::Extension(p);
-#endif  // WNT
+#endif  // _WIN32
   
   return CDM_MetaData::LookUp(theFolder,theName,theFile,theFile,UTL::IsReadOnly(theFile));
 }
index 37ba019..069b7cf 100644 (file)
@@ -59,11 +59,11 @@ Handle(Standard_Transient) Plugin::Load (const Standard_GUID& aGUID,
     }
     
     TCollection_AsciiString thePluginLibrary("");
-#ifndef WNT
+#ifndef _WIN32
     thePluginLibrary += "lib";
 #endif
     thePluginLibrary +=  PluginResource->Value(theResource.ToCString());
-#ifdef WNT
+#ifdef _WIN32
     thePluginLibrary += ".dll";
 #elif defined(__APPLE__)
     thePluginLibrary += ".dylib";
index 0587612..a23188a 100644 (file)
@@ -16,7 +16,7 @@
 #include <Poly_CoherentNode.hxx>
 #include <Poly_CoherentTriangle.hxx>
 
-#ifdef WNT
+#ifdef _MSC_VER
 #pragma warning(disable:4996)
 #endif
 
index 9f1fd1b..49f4a17 100644 (file)
@@ -21,7 +21,7 @@
 
 class Poly_CoherentTriangle;
 
-#ifdef WNT
+#ifdef _MSC_VER
 #pragma warning (push)
 #pragma warning(disable:4355) //'this' : used in base member initializer list
 #endif
@@ -177,7 +177,7 @@ class Poly_CoherentTriPtr
   friend class Iterator;
 };
 
-#ifdef WNT
+#ifdef _MSC_VER
 #pragma warning (pop)
 #endif
 
index edc7cd4..99539a8 100644 (file)
@@ -39,7 +39,7 @@
 #include <Draw_Viewer.hxx>
 #include <Draw.hxx>
 
-#ifndef WNT
+#ifndef _WIN32
 extern Draw_Viewer dout;
 #else
 Standard_IMPORT Draw_Viewer dout;
@@ -51,7 +51,7 @@ Standard_IMPORT Draw_Viewer dout;
 #include <BRepBuilderAPI_MakeFace.hxx>
 #include <TopoDS.hxx>
 
-#if ! defined(WNT)
+#if ! defined(_WIN32)
 extern ViewerTest_DoubleMapOfInteractiveAndName& GetMapOfAIS();
 #else
 Standard_EXPORT ViewerTest_DoubleMapOfInteractiveAndName& GetMapOfAIS();
index cc79a1e..8f31685 100644 (file)
@@ -80,7 +80,7 @@
 #include <TDocStd_Document.hxx>
 #include <Standard_ErrorHandler.hxx>
 
-#if ! defined(WNT)
+#if ! defined(_WIN32)
 extern ViewerTest_DoubleMapOfInteractiveAndName& GetMapOfAIS();
 #else
 Standard_EXPORT ViewerTest_DoubleMapOfInteractiveAndName& GetMapOfAIS();
index dbba186..cead6a1 100644 (file)
@@ -1348,7 +1348,7 @@ static Standard_Integer OCC24051 (Draw_Interpretor& di, Standard_Integer argc, c
        Standard_Integer nbThreads = 5;
        Voxel_FastConverter fcp(shape, theVoxels, deflection, nbx, nby, nbz, nbThreads, Standard_True);
        
-       #ifdef WNT
+       #ifdef _MSC_VER
        #pragma omp parallel for
         for(int i = 0; i < nbThreads; i++)
                        fcp.ConvertUsingSAT(progress, i+1);
@@ -3241,7 +3241,7 @@ static Standard_Integer OCC26139 (Draw_Interpretor& theDI,
 #include <OSD.hxx>
 #include <ShapeFix_Wire.hxx>
 #include <ShapeExtend_Status.hxx>
-#ifdef WNT
+#ifdef _WIN32
 #define EXCEPTION ...
 #else
 #define EXCEPTION Standard_Failure
index b4438af..87ce5db 100644 (file)
@@ -125,7 +125,7 @@ static int BUC60614(Draw_Interpretor& di, Standard_Integer argc, const char ** a
 #include<BRepAdaptor_HSurface.hxx>
 #include<TopOpeBRep_PointClassifier.hxx>
 #include<Precision.hxx>
-#ifdef WNT
+#ifdef _MSC_VER
 #include<stdio.h>
 #endif
 
index 4d31d01..e0f5145 100644 (file)
@@ -71,7 +71,7 @@ static Standard_Integer BUC60857 (Draw_Interpretor& di, Standard_Integer /*argc*
 #include <SelectMgr_Selection.hxx>
 #include <StdSelect_BRepOwner.hxx>
 #include <SelectBasics_SensitiveEntity.hxx>
-#if ! defined(WNT)
+#if ! defined(_WIN32)
 extern ViewerTest_DoubleMapOfInteractiveAndName& GetMapOfAIS();
 #else
 Standard_EXPORT ViewerTest_DoubleMapOfInteractiveAndName& GetMapOfAIS();
index 7404c8b..4552227 100644 (file)
@@ -50,7 +50,7 @@
 #include <gp_Trsf.hxx>
 
 #include <TColStd_HArray1OfInteger.hxx>
-//#ifdef WNT
+//#ifdef _MSC_VER
 #include <stdio.h>
 //#endif
 
index f6854fa..b75c5b5 100644 (file)
@@ -20,7 +20,7 @@
 
 
 #ifndef __Quantity_API
-# if defined(WNT) && !defined(HAVE_NO_DLL)
+# if defined(_WIN32) && !defined(HAVE_NO_DLL)
 #  ifdef __Quantity_DLL
 #   define __Quantity_API __declspec( dllexport )
 #  else
@@ -28,7 +28,7 @@
 #  endif  // __Quantity_DLL
 # else
 #   define __Quantity_API
-# endif  // WNT
+# endif  // _WIN32
 #endif  // __Quantity_API 
 
 
index ce615a0..d57da3a 100644 (file)
@@ -164,7 +164,7 @@ Handle(StepBasic_PersonAndOrganization) STEPConstruct_AP203Context::DefaultPerso
 {
   if ( defPersonAndOrganization.IsNull() ) {
     // get IP address as a unique id of organization
-#ifdef WNT // adapted for NT which lacks gethostent()
+#ifdef _WIN32 // adapted for NT which lacks gethostent()
     char hostname[1024];
     hostname[0] = '\0';
     gethostname ( hostname, 1020 );
index 236a9d2..7a4616c 100644 (file)
@@ -22,7 +22,7 @@
 #include <Standard_Mutex.hxx>
 #include <Standard.hxx>
 
-#ifndef WNT
+#ifndef _WIN32
 #include <pthread.h>
 #else
 #include <windows.h>
@@ -47,7 +47,7 @@ static Standard_Mutex theMutex;
 
 static inline Standard_ThreadId GetThreadID()
 {
-#ifndef WNT
+#ifndef _WIN32
   return pthread_self();
 #else
   return GetCurrentThreadId();
index 49652da..45ae928 100644 (file)
@@ -77,10 +77,10 @@ extern "C" int getpagesize() ;
 #elif defined(__APPLE__)
 #define MMAP_BASE_ADDRESS  0x80000000
 #define MMAP_FLAGS (MAP_ANON | MAP_PRIVATE)
-#elif defined(LIN)
+#elif defined(__linux__)
 #define MMAP_BASE_ADDRESS 0x20000000
 #define MMAP_FLAGS (MAP_PRIVATE)
-#elif defined(WNT)
+#elif defined(_WIN32)
 //static HANDLE myhMap;
 #else
 #define MMAP_BASE_ADDRESS 0x60000000
@@ -197,7 +197,7 @@ void Standard_MMgrOpt::Initialize()
     myNbPages = 1000;
   
   // get system-dependent page size
-#ifndef WNT
+#ifndef _WIN32
   myPageSize = getpagesize();
   if ( ! myPageSize )
     myMMap = 0;
@@ -247,7 +247,7 @@ void Standard_MMgrOpt::Initialize()
       perror("ERR_MEMRY_FAIL");
 #endif
     
-#if defined(IRIX) || defined(__sgi) || defined(SOLARIS) || defined(__sun) || defined(LIN) || defined(linux) || defined(__FreeBSD__) || defined(__ANDROID__)
+#if defined(IRIX) || defined(__sgi) || defined(SOLARIS) || defined(__sun) || defined(__linux__) || defined(linux) || defined(__FreeBSD__) || defined(__ANDROID__)
     if ((myMMap = open ("/dev/zero", O_RDWR)) < 0) {
       if ((myMMap = open ("/dev/null", O_RDWR)) < 0){
         myMMap = 0;
@@ -505,7 +505,7 @@ Standard_Integer Standard_MMgrOpt::Purge(Standard_Boolean )
   // release memory pools containing no busy memory;
   // for that for each pool count the summary size of blocks
   // got from the free lists allocated from this pool
-#ifndef WNT
+#ifndef _WIN32
   const Standard_Size PoolSize = myPageSize * myNbPages;
 #else
   const Standard_Size PoolSize =
@@ -708,7 +708,7 @@ retry:
 
   // if MMap option is ON, allocate using memory mapped files
   if (myMMap) {
-#ifndef WNT
+#ifndef _WIN32
 
     // align size to page size
     const Standard_Size AlignedSize = PAGE_ALIGN(Size, myPageSize);
@@ -730,7 +730,7 @@ retry:
     // save actually allocated size into argument
     Size = AlignedSize;
 
-#else /* WNT */
+#else /* _WIN32 */
 
     // align size to page size, taking into account additional space needed to
     // store handle to the memory map
@@ -797,14 +797,14 @@ retry:
 
 void Standard_MMgrOpt::FreeMemory (Standard_Address aBlock, 
                                    const Standard_Size
-#ifndef WNT                                   
+#ifndef _WIN32                                   
                                    aSize
 #endif
                                   )
 {
   // release memory (either free or unmap)
   if ( myMMap ) {
-#ifndef WNT
+#ifndef _WIN32
     // align size to page size, just the same as in AllocMemory()
     const Standard_Size AlignedSize = PAGE_ALIGN(aSize, myPageSize);
     munmap((char*)aBlock, AlignedSize);
index b7eec7d..de1d4b0 100644 (file)
 #include <Standard_MMgrTBBalloc.hxx>
 #include <Standard_OutOfMemory.hxx>
 
-// NOTE: replaced by more correct check
-//#if defined(WNT) || defined(LIN)
-//#define HAVE_TBB 1
-//#endif
-
 // paralleling with Intel TBB
 #ifdef HAVE_TBB
 #include <tbb/scalable_allocator.h>
index 78faf57..d7be331 100644 (file)
 // Windows-specific definitions
 //======================================================
 
-// check if WNT macro is not defined but compiler is MSVC
-#if defined(_MSC_VER) && !defined(WNT)
-#error "Wrong compiler options has been detected. Add /DWNT option for proper compilation!!!!!"
-#endif
-
 # if defined(_WIN32) && !defined(HAVE_NO_DLL)
 
 #  ifndef Standard_EXPORT
@@ -94,7 +89,7 @@
 #define NOIME NOIME
 #endif
 
-# else  /* WNT */
+# else  /* UNIX */
 
 //======================================================
 // UNIX definitions
 #define        _MEMORY_H
 #endif
 
-# endif  /* WNT */
+# endif  /* _WIN32 */
 
 //======================================================
 // Other
 //======================================================
 
 # ifndef __Standard_API
-//#  ifdef WNT
 #   if !defined(_WIN32) || defined(__Standard_DLL) || defined(__FSD_DLL) || defined(__MMgt_DLL) || defined(__OSD_DLL) || defined(__Plugin_DLL) || defined(__Quantity_DLL) || defined(__Resource_DLL) || defined(__SortTools_DLL) || defined(__StdFail_DLL) || defined(__Storage_DLL) || defined(__TColStd_DLL) || defined(__TCollection_DLL) || defined(__TShort_DLL) || defined(__Units_DLL) || defined(__UnitsAPI_DLL) || defined(__Dico_DLL)
 #    define __Standard_API Standard_EXPORT
 #    define __Standard_APIEXTERN Standard_EXPORTEXTERN
 #    define __Standard_API Standard_IMPORT
 #    define __Standard_APIEXTERN Standard_IMPORT
 #   endif  // __Standard_DLL
-//#  else
-//#   define __Standard_API
-//#  endif  // WNT
 # endif  // __Standard_API
 
 #endif  
index 2e4048b..a129f38 100644 (file)
@@ -18,7 +18,7 @@
 
 // Platform-dependent definition of the thread identifier type
 
-#ifdef WNT
+#ifdef _WIN32
 
 #include <windows.h>
 typedef DWORD Standard_ThreadId;
index 6d2eb59..9a863ec 100644 (file)
@@ -17,7 +17,7 @@
 
 #include <Standard_Type.hxx>
 
-#ifdef WNT
+#ifdef _WIN32
 #include <windows.h>
 #else
 typedef struct {
index 696a7a5..b51b98f 100644 (file)
 #ifndef _Standard_values_HeaderFile
 # define _Standard_values_HeaderFile
 
-#if defined(_MSC_VER) && !defined(WNT)
-#error "Wrong compiler options has been detected. Add /DWNT option for proper compilation!!!!!"
-#endif
-
 #ifdef _WIN32
 # include <limits>
 #else
index 080ad93..66baa71 100644 (file)
 
 #include <stdio.h>
 
-#ifdef WNT
+#ifdef _MSC_VER
 # include <stdlib.h>
 # include <io.h>
-#endif  /* WNT */
+#endif  /* _MSC_VER */
 
 
 
index b0e8232..4a574f0 100644 (file)
@@ -97,8 +97,8 @@
 */
 
 /* ABV 19.12.00: merging porting modifications by POP (for WNT, AIX) */
-#if defined(WNT) && !defined(MSDOS)
-#define MSDOS WNT
+#if defined(_WIN32) && !defined(MSDOS)
+#define MSDOS _WIN32
 #endif
 #if defined(_AIX)
 #include <malloc.h>
index c2ff9e9..dccf6c6 100644 (file)
 //purpose  : 
 //=======================================================================
 
-//#ifndef WNT
-//inline  static Standard_Integer TDF_LabelMapHasher::HashCode
-//#else
-inline         Standard_Integer TDF_LabelMapHasher::HashCode
-//#endif
+inline Standard_Integer TDF_LabelMapHasher::HashCode
 (const TDF_Label& aLab, const Standard_Integer Upper) 
 { return 1 + ( (int) (labs((long int) aLab.myLabelNode) % Upper) ); }
 
@@ -39,10 +35,6 @@ inline         Standard_Integer TDF_LabelMapHasher::HashCode
 //purpose  : 
 //=======================================================================
 
-//#ifndef WNT
-//inline  static Standard_Boolean TDF_LabelMapHasher::IsEqual
-//#else
-inline         Standard_Boolean TDF_LabelMapHasher::IsEqual
-//#endif
+inline Standard_Boolean TDF_LabelMapHasher::IsEqual
 (const TDF_Label& aLab1,const TDF_Label& aLab2) 
 { return aLab1.IsEqual(aLab2); }
index 295c6ad..14f7c8e 100644 (file)
@@ -34,7 +34,7 @@
 #include <TDF_Label.hxx>
 #include <TDF_RelocationTable.hxx>
 
-#ifdef WNT
+#ifdef _WIN32
 #define EXCEPTION ...
 #else
 #define EXCEPTION Standard_Failure
index a9bb2fe..eba6f72 100644 (file)
@@ -35,7 +35,7 @@ void TDocStd_PathParser::Parse()
        temp.Trunc(PointPosition-1);
        Standard_Boolean isFileName = (temp.Length()) ? Standard_True : Standard_False;
        Standard_Boolean isTrek = Standard_True;
-#ifdef WNT
+#ifdef _WIN32
        PointPosition = temp.SearchFromEnd(TCollection_ExtendedString("\\"));
        if (!(PointPosition>0))
                PointPosition = temp.SearchFromEnd(TCollection_ExtendedString("/"));
@@ -59,12 +59,12 @@ void TDocStd_PathParser::Parse()
          else
            return;
        }
-#endif //WNT
+#endif //_WIN32
        if(isTrek) {
          temp.Trunc(PointPosition-1);
          myTrek = temp;
        } else 
-#ifdef WNT
+#ifdef _WIN32
          myTrek = ".\\";
 #else
        myTrek = "./";
index dfd71e3..4f705be 100644 (file)
@@ -60,7 +60,7 @@ static void LWrite(const TopoDS_Shape& shape,
 {
   char buf[256];
   if(strlen(filename) > 256) return;
-#if defined WNT 
+#if defined _MSC_VER
   strcpy_s (buf, filename);
 #else
   strcpy (buf, filename);
index 389848a..056c75b 100644 (file)
@@ -34,7 +34,7 @@ static void WriteS(const TopoDS_Shape& shape,
 {
   char buf[256];
   if(strlen(filename) > 255) return;
-#ifdef WNT
+#ifdef _MSC_VER
   strcpy_s (buf, filename);
 #else
   strcpy (buf, filename);
index 1747c65..d18f766 100644 (file)
@@ -61,7 +61,7 @@ static void Write(const TopoDS_Shape& shape,
 {
   char buf[256];
   if(strlen(filename) > 255) return;
-#if defined WNT
+#if defined _MSC_VER
   strcpy_s (buf, filename);
 #else
   strcpy (buf, filename);
index 4479c98..84f9562 100644 (file)
@@ -43,7 +43,7 @@
 #include <Message_Msg.hxx>
 #include <OSD_OpenFile.hxx>
 
-#ifdef WNT
+#ifdef _MSC_VER
   #include <io.h>
 #else
   #include <unistd.h>
index 770cb05..778949b 100644 (file)
@@ -35,7 +35,7 @@
 
 #include <stdio.h>
 // avoid warnings on 'extern "C"' functions returning C++ classes
-#ifdef WNT
+#ifdef _MSC_VER
 #pragma warning(4:4190)
 #endif
 
index b896070..5fcb3f6 100644 (file)
@@ -30,7 +30,7 @@
 #include <TopOpeBRepDS_Dumper.hxx>
 #include <TopOpeBRepDS_HDataStructure.hxx>
 
-#ifdef WNT
+#ifdef _MSC_VER
 #pragma warning(4:4190)
 #endif
 
index df743d7..0d9d438 100644 (file)
@@ -44,7 +44,7 @@
 #include <gp_Pnt.hxx>
 #include <DBRep.hxx>
 #include <Draw_Appli.hxx>
-#ifdef WNT
+#ifdef _WIN32
 Standard_IMPORT Draw_Viewer dout;
 #endif
 
index 3ee4178..f7777d5 100644 (file)
@@ -29,7 +29,7 @@
 #include <TopOpeBRepBuild_HBuilder.hxx>
 #include <TopOpeBRepDS_HDataStructure.hxx>
 
-#ifdef WNT
+#ifdef _WIN32
 Standard_IMPORT Draw_Viewer dout;
 #endif
 
index 277b2f4..7387723 100644 (file)
@@ -31,7 +31,7 @@
 #include <DBRep.hxx>
 #include <DBRep_DrawableShape.hxx>
 
-#ifdef WNT
+#ifdef _WIN32
 Standard_IMPORT Draw_Viewer dout;
 #endif
 
index 8eebf75..f698f92 100644 (file)
@@ -140,7 +140,7 @@ const TopoDS_Shape&  TopExp_Explorer::Current()const
 //purpose  : 
 //=======================================================================
 
-#ifdef WNT
+#ifdef _MSC_VER
 #pragma warning(push)
 #pragma warning(disable: 4291) // to avoid warning when using new(buffer) syntax
 #endif
@@ -222,7 +222,7 @@ void  TopExp_Explorer::Next()
   hasMore = Standard_False;
 }
 
-#ifdef WNT
+#ifdef _MSC_VER
 #pragma warning(pop)
 #endif
 
index 9b37bd5..803f090 100644 (file)
@@ -18,7 +18,7 @@
 
 #include <TopOpeBRep.hxx>
 
-//#ifdef WNT
+//#ifdef _WIN32
 //#define strcasecmp strcmp Already defined
 //#endif
 //=======================================================================
index 46b7011..2d86e74 100644 (file)
@@ -1190,7 +1190,7 @@ static void MergeWLinesIfAllSegmentsAlongRestriction(IntPatch_SequenceOfLine&
   if (!anWLine.IsNull()) {
     theSlin.Clear();
     theSlin.Append(anWLine);
-#ifdef DEB
+#ifdef OCCT_DEBUG
     cout << "*** TopOpeBRep_FaceIntersector: Merge WLines on Restriction " 
          << ((WLineRank == 1) ? "S1" : "S2") << " to WLine***" << endl;
 #endif
index e18fa77..77013e6 100644 (file)
 
 #include <sys/stat.h>
 #include <sys/types.h>
-#ifdef WNT
+#ifdef _MSC_VER
 # include <stdio.h>
 #else
 #include <Standard_Stream.hxx>
-#endif  // WNT
+#endif  // _MSC_VER
 
 //=======================================================================
 //function : Units_Lexicon
index aa3c37c..ee4da11 100644 (file)
@@ -31,7 +31,7 @@ static UnitsAPI_SystemUnits localSystem = UnitsAPI_SI;
 static UnitsAPI_SystemUnits currentSystem = UnitsAPI_DEFAULT;
 static OSD_Environment env1("CSF_UnitsLexicon");
 static OSD_Environment env2("CSF_UnitsDefinition");
-#ifdef WNT
+#ifdef _WIN32
 static OSD_Environment env3("CSF_CurrentUnits");
 static OSD_Environment env4("CSF_MDTVCurrentUnits");
 #endif
@@ -79,7 +79,7 @@ void UnitsAPI::CheckLoading (const UnitsAPI_SystemUnits aSystemUnits)
       case UnitsAPI_SI :  
         currentSystem = UnitsAPI_SI; 
         if( SICurrentUnits.IsNull() ) {
-#ifdef WNT
+#ifdef _WIN32
           TCollection_AsciiString csfcurrent (env3.Value());
           if( csfcurrent.Length() > 0 )
                 SICurrentUnits = new Resource_Manager(csfcurrent.ToCString());
@@ -95,7 +95,7 @@ void UnitsAPI::CheckLoading (const UnitsAPI_SystemUnits aSystemUnits)
       case UnitsAPI_MDTV :  
         currentSystem = UnitsAPI_MDTV; 
         if( MDTVCurrentUnits.IsNull() )  {
-#ifdef WNT
+#ifdef _WIN32
           TCollection_AsciiString csfmdtvcurrent (env4.Value());
           if( csfmdtvcurrent.Length() > 0 )
                 MDTVCurrentUnits = new Resource_Manager(csfmdtvcurrent.ToCString());
index c0316af..dede6b0 100644 (file)
@@ -18,7 +18,7 @@
 /* Includes                                                             */
 /************************************************************************/
 
-#ifdef WNT
+#ifdef _WIN32
 #include <windows.h>
 #pragma comment( lib, "comdlg32.lib"  )
 #endif
@@ -44,7 +44,7 @@
 #include <V3d_View.hxx>
 #include <V3d_Viewer.hxx>
 
-#ifdef WNT
+#ifdef _WIN32
 struct Device
 {
        Device();
@@ -88,7 +88,7 @@ Standard_Boolean V3d_View::Print (const Aspect_Handle    thePrintDC,
                                   const Standard_CString theFilename,
                                   const Aspect_PrintAlgo thePrintAlgorithm) const
 {
-#ifdef WNT
+#ifdef _WIN32
   if (myView->IsDefined())
   {
     if (thePrintDC != NULL)
index 0028b3c..69e3e01 100644 (file)
@@ -76,7 +76,7 @@
 #include <Draw_PluginMacro.hxx>
 
 // avoid warnings on 'extern "C"' functions returning C++ classes
-#ifdef WNT
+#ifdef _MSC_VER
 #define _CRT_SECURE_NO_DEPRECATE
 #pragma warning(4:4190)
 #pragma warning (disable:4996)
index 8fb76db..64aef0a 100644 (file)
@@ -70,7 +70,7 @@
 #include <Prs3d_LineAspect.hxx>
 #include <Prs3d_Root.hxx>
 
-#ifdef WNT
+#ifdef _WIN32
 #undef DrawText
 #endif
 
@@ -196,7 +196,7 @@ Standard_Boolean DragFirst = Standard_False;
 
 //==============================================================================
 
-#ifdef WNT
+#ifdef _WIN32
 static LRESULT WINAPI ViewerWindowProc(
                                        HWND hwnd,
                                        UINT uMsg,
@@ -1864,7 +1864,7 @@ static int VHelp(Draw_Interpretor& di, Standard_Integer , const char** )
   return 0;
 }
 
-#ifdef WNT
+#ifdef _WIN32
 
 static Standard_Boolean Ppick = 0;
 static Standard_Integer Pargc = 0;
@@ -2489,7 +2489,7 @@ static void OSWindowSetup()
   XSynchronize(aDisplay, 0);
 
 #else
-  // WNT
+  // _WIN32
 #endif
 
 }
@@ -4202,8 +4202,8 @@ static int VGraduatedTrihedron (Draw_Interpretor& /*theDi*/, Standard_Integer th
 static int VPrintView (Draw_Interpretor& di, Standard_Integer argc,
                        const char** argv)
 {
-#ifndef WNT
-  di << "Printing implemented only for wnt!\n";
+#ifndef _WIN32
+  di << "Printing implemented only for WNT!\n";
   return 0;
 #else
 
index e36e774..36a7c6c 100644 (file)
@@ -33,7 +33,7 @@
 #include <Standard_ErrorHandler.hxx>
 #include <VrmlData_ArrayVec3d.hxx>
 
-#ifdef WNT
+#ifdef _MSC_VER
 #define _CRT_SECURE_NO_DEPRECATE
 #pragma warning (disable:4996)
 #endif
index e296250..1cb2ca1 100644 (file)
@@ -23,7 +23,7 @@
 #include <Precision.hxx>
 #include <gp_Ax1.hxx>
 
-#ifdef WNT
+#ifdef _MSC_VER
 #define _CRT_SECURE_NO_DEPRECATE
 #pragma warning (disable:4996)
 #endif
index 992e30c..04b73d9 100644 (file)
@@ -29,7 +29,7 @@
 #include <Poly.hxx>
 #include <TShort_HArray1OfShortReal.hxx>
 
-#ifdef WNT
+#ifdef _MSC_VER
 #define _CRT_SECURE_NO_DEPRECATE
 #pragma warning (disable:4996)
 #endif
index 4e711a7..474f46a 100644 (file)
@@ -26,7 +26,7 @@
 #include <VrmlData_Color.hxx>
 #include <VrmlData_Coordinate.hxx>
 
-#ifdef WNT
+#ifdef _MSC_VER
 #define _CRT_SECURE_NO_DEPRECATE
 #pragma warning (disable:4996)
 #endif
index 06b0a99..474ead2 100644 (file)
@@ -19,7 +19,7 @@
 #include <VrmlData_Scene.hxx>
 #include <gp_XYZ.hxx>
 
-#ifdef WNT
+#ifdef _MSC_VER
 #define _CRT_SECURE_NO_DEPRECATE
 #pragma warning (disable:4996)
 #endif
index 9707e6d..54b4cfd 100644 (file)
@@ -27,7 +27,7 @@
 #include <VrmlData_TextureTransform.hxx>
 #include <VrmlData_Texture.hxx>
 
-#ifdef WNT
+#ifdef _MSC_VER
 #define _CRT_SECURE_NO_DEPRECATE
 #pragma warning (disable:4996)
 #endif
index bd94a4a..a1e3a51 100644 (file)
@@ -46,7 +46,7 @@
 #include <VrmlData_WorldInfo.hxx>
 #include <VrmlData_Geometry.hxx>
 
-#ifdef WNT
+#ifdef _MSC_VER
 #define _CRT_SECURE_NO_DEPRECATE
 #pragma warning (disable:4996)
 #endif
@@ -177,7 +177,7 @@ void VrmlData_Scene::SetVrmlDir (const TCollection_ExtendedString& theDir)
   const Standard_ExtCharacter aTerminator = aDir.Value(aDir.Length());
   if (aTerminator != Standard_ExtCharacter('\\') &&
       aTerminator != Standard_ExtCharacter('/'))
-#ifdef WNT
+#ifdef _WIN32
     aDir += TCollection_ExtendedString ("\\");
 #else
     aDir += TCollection_ExtendedString ("/");
index 9005623..96fe619 100644 (file)
@@ -17,7 +17,7 @@
 #include <VrmlData_Scene.hxx>
 #include <VrmlData_InBuffer.hxx>
 
-#ifdef WNT
+#ifdef _MSC_VER
 #define _CRT_SECURE_NO_DEPRECATE
 #pragma warning (disable:4996)
 #endif
index 825e926..092fc1b 100644 (file)
@@ -92,7 +92,7 @@
 #include <stdio.h>
 #define ZVIEW_SIZE 1000000.0
 // avoid warnings on 'extern "C"' functions returning C++ classes
-#ifdef WNT
+#ifdef _MSC_VER
 #pragma warning(4:4190)
 #endif
 
index 86fa0cc..c5ef907 100644 (file)
@@ -69,7 +69,7 @@
 #include <XSDRAWSTLVRML_DrawableMesh.hxx>
 
 // avoid warnings on 'extern "C"' functions returning C++ classes
-#ifdef WNT
+#ifdef _MSC_VER
 #pragma warning(4:4190)
 #endif
 
index a6323c8..a62f7cc 100644 (file)
@@ -40,9 +40,9 @@
 #include <XmlObjMgt_Document.hxx>
 #include <XmlObjMgt_RRelocationTable.hxx>
 
-#ifdef WNT
+#ifdef _MSC_VER
 # include <tchar.h>
-#endif  // WNT
+#endif  // _MSC_VER
 
 #include <locale.h>
 #include <Standard_Failure.hxx>
@@ -66,7 +66,7 @@ static Standard_Integer RemoveExtraSeparator(TCollection_AsciiString& aString) {
   Standard_Integer i, j, len ;
 
   len = aString.Length() ;
-#ifdef WNT
+#ifdef _WIN32
   // Case of network path, such as \\MACHINE\dir
   for (i = j = 2 ; j <= len ; i++,j++) {
 #else
@@ -86,7 +86,7 @@ static TCollection_AsciiString GetDirFromFile(const TCollection_ExtendedString&
   TCollection_AsciiString theCFile=UTL::CString(aFileName);
   TCollection_AsciiString theDirectory;
   Standard_Integer i=theCFile.SearchFromEnd("/");
-#ifdef WNT    
+#ifdef _WIN32    
 //    if(i==-1) i=theCFile.SearchFromEnd("\\");
   if(theCFile.SearchFromEnd("\\") > i)
     i=theCFile.SearchFromEnd("\\");
@@ -100,7 +100,7 @@ static TCollection_AsciiString AbsolutePath(
                             const TCollection_AsciiString& aRelFilePath)
 {
   TCollection_AsciiString EmptyString = "" ;
-#ifdef WNT
+#ifdef _WIN32
   if (aRelFilePath.Search(":") == 2 ||
       (aRelFilePath.Search("\\") == 1 && aRelFilePath.Value(2) == '\\'))
 #else
@@ -111,7 +111,7 @@ static TCollection_AsciiString AbsolutePath(
   TCollection_AsciiString DirPath = aDirPath, RelFilePath = aRelFilePath  ;
   Standard_Integer i,len ;
   
-#ifdef WNT
+#ifdef _WIN32
   if(DirPath.Search(":") != 2 &&
      (DirPath.Search("\\") != 1 || DirPath.Value(2) != '\\'))
 #else
@@ -119,7 +119,7 @@ static TCollection_AsciiString AbsolutePath(
 #endif
     return EmptyString ;
 
-#ifdef WNT
+#ifdef _WIN32
   DirPath.ChangeAll('\\','/') ;
   RelFilePath.ChangeAll('\\','/') ;      
 #endif
@@ -323,7 +323,7 @@ void XmlLDrivers_DocumentRetrievalDriver::ReadFromDomDocument
     TCollection_ExtendedString theFolder,theName;
         //TCollection_ExtendedString theFile=myReferences(myIterator).FileName();
         TCollection_ExtendedString f(aPath);
-#ifndef WNT
+#ifndef _WIN32
         
         Standard_Integer i= f.SearchFromEnd("/");
         TCollection_ExtendedString n = f.Split(i); 
@@ -360,7 +360,7 @@ void XmlLDrivers_DocumentRetrievalDriver::ReadFromDomDocument
         }
         theFolder = dirRet;
         theName   = UTL::Name(p); theName+= UTL::Extension(p);
-#endif  // WNT
+#endif  // _WIN32
         
         Handle(CDM_MetaData) aMetaData =  CDM_MetaData::LookUp(theFolder,theName,aPath,aPath,UTL::IsReadOnly(aFileName));
 ////////////
@@ -476,7 +476,7 @@ Handle(XmlMDF_ADriverTable) XmlLDrivers_DocumentRetrievalDriver::AttributeDriver
 #include <sys/timeb.h>
 #include <sys/types.h>
 #include <stdio.h>
-#ifndef WNT
+#ifndef _WIN32
 extern "C" int ftime (struct timeb *tp);
 #endif
 extern struct timeb  tmbuf0;
index 2e9e9ec..c34bad1 100644 (file)
@@ -380,7 +380,7 @@ Handle(XmlMDF_ADriverTable) XmlLDrivers_DocumentStorageDriver::AttributeDrivers
 #include <sys/timeb.h>
 #include <sys/types.h>
 #include <stdio.h>
-#ifndef WNT
+#ifndef _WIN32
 extern "C" int ftime (struct timeb *tp);
 #endif
 struct timeb  tmbuf0;
index b3794a4..2aab64c 100644 (file)
@@ -55,7 +55,7 @@ IMPLEMENT_DOMSTRING (LastRealArrIndex,   "lastRA")
 IMPLEMENT_DOMSTRING (ExtString, "string")
 IMPLEMENT_DOMSTRING (Value,     "value")
 
-#ifdef WNT
+#ifdef _WIN32
 #define EXCEPTION ...
 #else
 #define EXCEPTION Standard_Failure
index 2a88363..43903ba 100644 (file)
@@ -27,8 +27,6 @@
 #include <TColStd_Array1OfReal.hxx>
 
 #include <stdio.h>
-//#ifdef WNT
-//#endif
 #define ITMAX  100
 #define EPS    1e-14
 #define EPSEPS 2e-14
index 5a06863..da361f2 100644 (file)
@@ -20,7 +20,7 @@
 #include <Standard_Real.hxx>
 
 #ifndef __math_API
-# if defined(WNT) && !defined(HAVE_NO_DLL)
+# if defined(_WIN32) && !defined(HAVE_NO_DLL)
 #  ifdef __math_DLL
 #   define __math_API __declspec( dllexport )
 #  else
@@ -28,7 +28,7 @@
 #  endif  /* __math_DLL */
 # else
 #  define __math_API
-# endif  /* WNT */
+# endif  /* _WIN32 */
 #endif  /* __math_API */
 
 class math_IntegerVector;