diff --git a/adm/CMPLRS b/adm/CMPLRS index 745205e433..88ababc38b 100644 --- a/adm/CMPLRS +++ b/adm/CMPLRS @@ -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 diff --git a/adm/cmake/occt_defs_flags.cmake b/adm/cmake/occt_defs_flags.cmake index a857f9f985..60b5872d25 100644 --- a/adm/cmake/occt_defs_flags.cmake +++ b/adm/cmake/occt_defs_flags.cmake @@ -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 diff --git a/adm/genproj.tcl b/adm/genproj.tcl index af862eb25f..42b4893bef 100644 --- a/adm/genproj.tcl +++ b/adm/genproj.tcl @@ -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" } diff --git a/adm/templates/template.vc10 b/adm/templates/template.vc10 index a2ed38a74e..064aa2a7ce 100644 --- a/adm/templates/template.vc10 +++ b/adm/templates/template.vc10 @@ -85,7 +85,7 @@ true MaxSpeed OnlyExplicitInline - NDEBUG;WIN32;_WINDOWS;WNT;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions) + NDEBUG;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions) true Async MultiThreadedDLL @@ -100,7 +100,7 @@ ..\..\..\inc;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) - NDEBUG;WIN32;_WINDOWS;WNT;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions) + NDEBUG;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions) __TKDEP__;ws2_32.lib;vfw32.lib;%(AdditionalDependencies) @@ -128,7 +128,7 @@ true Disabled OnlyExplicitInline - DEB;_DEBUG;WIN32;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions) + _DEBUG;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions) Async MultiThreadedDebugDLL .\..\..\..\win32\__VCVER__\objd\__TKNAM__/ @@ -144,7 +144,7 @@ ..\..\..\inc;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) - DEB;_DEBUG;WIN32;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions) + _DEBUG;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions) __TKDEP__;ws2_32.lib;vfw32.lib;%(AdditionalDependencies) @@ -173,7 +173,7 @@ true MaxSpeed OnlyExplicitInline - NDEBUG;WIN64;_WINDOWS;WNT;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions) + NDEBUG;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions) true Async MultiThreadedDLL @@ -188,7 +188,7 @@ ..\..\..\inc;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) - NDEBUG;WIN64;_WINDOWS;WNT;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions) + NDEBUG;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions) __TKDEP__;ws2_32.lib;vfw32.lib;%(AdditionalDependencies) @@ -216,7 +216,7 @@ true Disabled OnlyExplicitInline - DEB;_DEBUG;WIN64;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions) + _DEBUG;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions) Async MultiThreadedDebugDLL .\..\..\..\win64\__VCVER__\objd\__TKNAM__/ @@ -232,7 +232,7 @@ ..\..\..\inc;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) - DEB;_DEBUG;WIN64;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions) + _DEBUG;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions) __TKDEP__;ws2_32.lib;vfw32.lib;%(AdditionalDependencies) diff --git a/adm/templates/template.vc10x b/adm/templates/template.vc10x index 7ad650f9bf..762ada84e6 100644 --- a/adm/templates/template.vc10x +++ b/adm/templates/template.vc10x @@ -85,7 +85,7 @@ true MaxSpeed OnlyExplicitInline - NDEBUG;WIN32;_WINDOWS;WNT;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions) + NDEBUG;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions) true Async MultiThreadedDLL @@ -100,7 +100,7 @@ ..\..\..\inc;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) - NDEBUG;WIN32;_WINDOWS;WNT;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions) + NDEBUG;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions) __TKDEP__;%(AdditionalDependencies) @@ -127,7 +127,7 @@ true Disabled OnlyExplicitInline - DEB;_DEBUG;WIN32;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions) + _DEBUG;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions) Async MultiThreadedDebugDLL .\..\..\..\win32\__VCVER__\objd\__XQTNAM__/ @@ -143,7 +143,7 @@ ..\..\..\inc;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) - DEB;_DEBUG;WIN32;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions) + _DEBUG;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions) __TKDEP__;%(AdditionalDependencies) @@ -171,7 +171,7 @@ true MaxSpeed OnlyExplicitInline - NDEBUG;WIN64;_WINDOWS;WNT;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions) + NDEBUG;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions) true Async MultiThreadedDLL @@ -186,7 +186,7 @@ ..\..\..\inc;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) - NDEBUG;WIN64;_WINDOWS;WNT;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions) + NDEBUG;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions) __TKDEP__;%(AdditionalDependencies) @@ -213,7 +213,7 @@ true Disabled OnlyExplicitInline - DEB;_DEBUG;WIN64;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions) + _DEBUG;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions) Async MultiThreadedDebugDLL .\..\..\..\win64\__VCVER__\objd\__XQTNAM__/ @@ -229,7 +229,7 @@ ..\..\..\inc;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) - DEB;_DEBUG;WIN64;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions) + _DEBUG;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions) __TKDEP__;%(AdditionalDependencies) diff --git a/adm/templates/template.vc7 b/adm/templates/template.vc7 index 0ffd6e3631..4a2f536beb 100644 --- a/adm/templates/template.vc7 +++ b/adm/templates/template.vc7 @@ -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 @@ @@ -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__/" @@ -131,7 +131,7 @@ diff --git a/adm/templates/template.vc7x b/adm/templates/template.vc7x index 821035a15e..769fc928f0 100644 --- a/adm/templates/template.vc7x +++ b/adm/templates/template.vc7x @@ -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 @@ @@ -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" @@ -124,7 +124,7 @@ diff --git a/adm/templates/template.vc8 b/adm/templates/template.vc8 index ca5bd7f1ce..b76c872a2a 100644 --- a/adm/templates/template.vc8 +++ b/adm/templates/template.vc8 @@ -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 @@ #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*/ //**************************************************** diff --git a/src/AppCont/AppCont_ContMatrices.hxx b/src/AppCont/AppCont_ContMatrices.hxx index 44113e0773..861efbc421 100644 --- a/src/AppCont/AppCont_ContMatrices.hxx +++ b/src/AppCont/AppCont_ContMatrices.hxx @@ -18,7 +18,7 @@ #include //#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 */ diff --git a/src/AppDef/AppDef_Variational.cxx b/src/AppDef/AppDef_Variational.cxx index 622d255915..87f3c7b9bc 100644 --- a/src/AppDef/AppDef_Variational.cxx +++ b/src/AppDef/AppDef_Variational.cxx @@ -82,10 +82,10 @@ // Add this line: #include -#if defined(WNT) +#if defined(_MSC_VER) # include # include -#endif /* WNT */ +#endif /* _MSC_VER */ // //======================================================================= diff --git a/src/Aspect/Aspect_Drawable.hxx b/src/Aspect/Aspect_Drawable.hxx index 1d81797ddc..eadfb13992 100644 --- a/src/Aspect/Aspect_Drawable.hxx +++ b/src/Aspect/Aspect_Drawable.hxx @@ -22,10 +22,10 @@ #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 */ diff --git a/src/Aspect/Aspect_Handle.hxx b/src/Aspect/Aspect_Handle.hxx index 28476ee498..660f25376a 100644 --- a/src/Aspect/Aspect_Handle.hxx +++ b/src/Aspect/Aspect_Handle.hxx @@ -21,11 +21,11 @@ #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 */ diff --git a/src/Aspect/Aspect_XWD.hxx b/src/Aspect/Aspect_XWD.hxx index 041ac232d9..474e82c5dd 100644 --- a/src/Aspect/Aspect_XWD.hxx +++ b/src/Aspect/Aspect_XWD.hxx @@ -89,5 +89,5 @@ typedef struct _xcolor { } XColor; -# endif /* WNT */ +# endif /* _WIN32 */ #endif /* __Aspect_WNTXWD_HXX */ diff --git a/src/BOPDS/BOPDS_PassKey.cxx b/src/BOPDS/BOPDS_PassKey.cxx index 311ad59163..fcc5cdf5f9 100644 --- a/src/BOPDS/BOPDS_PassKey.cxx +++ b/src/BOPDS/BOPDS_PassKey.cxx @@ -19,7 +19,7 @@ #include #include -#ifdef WNT +#ifdef _MSC_VER #pragma warning( disable : 4101) #endif diff --git a/src/BOPDS/BOPDS_PaveBlock.cxx b/src/BOPDS/BOPDS_PaveBlock.cxx index c8fd2cfe4d..f2c840caba 100755 --- a/src/BOPDS/BOPDS_PaveBlock.cxx +++ b/src/BOPDS/BOPDS_PaveBlock.cxx @@ -23,7 +23,7 @@ #include #include -#ifdef WNT +#ifdef _MSC_VER #pragma warning ( disable : 4291 ) #endif diff --git a/src/BRepCheck/BRepCheck_Wire.cxx b/src/BRepCheck/BRepCheck_Wire.cxx index d5ee8077fe..9fbccc3b90 100644 --- a/src/BRepCheck/BRepCheck_Wire.cxx +++ b/src/BRepCheck/BRepCheck_Wire.cxx @@ -74,9 +74,6 @@ #include #include -//Patch -//#ifdef WNT -//#endif static void Propagate(const TopTools_IndexedDataMapOfShapeListOfShape&, const TopoDS_Shape&, // edge TopTools_MapOfShape&); // mapofedge diff --git a/src/BRepMesh/BRepMesh_Delaun.cxx b/src/BRepMesh/BRepMesh_Delaun.cxx index 6f43de69f0..d635587c9a 100644 --- a/src/BRepMesh/BRepMesh_Delaun.cxx +++ b/src/BRepMesh/BRepMesh_Delaun.cxx @@ -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 : diff --git a/src/BRepMesh/BRepMesh_DiscretFactory.cxx b/src/BRepMesh/BRepMesh_DiscretFactory.cxx index bc4e7d7d3e..c54c2a95cf 100644 --- a/src/BRepMesh/BRepMesh_DiscretFactory.cxx +++ b/src/BRepMesh/BRepMesh_DiscretFactory.cxx @@ -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"; diff --git a/src/BRepTest/BRepTest_BasicCommands.cxx b/src/BRepTest/BRepTest_BasicCommands.cxx index 6feb10d035..579ebae19b 100644 --- a/src/BRepTest/BRepTest_BasicCommands.cxx +++ b/src/BRepTest/BRepTest_BasicCommands.cxx @@ -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; } diff --git a/src/BRepTest/BRepTest_CurveCommands.cxx b/src/BRepTest/BRepTest_CurveCommands.cxx index f413e21d2c..2b974fe236 100644 --- a/src/BRepTest/BRepTest_CurveCommands.cxx +++ b/src/BRepTest/BRepTest_CurveCommands.cxx @@ -69,7 +69,7 @@ #include #include -#ifdef WNT +#ifdef _WIN32 Standard_IMPORT Draw_Viewer dout; #endif diff --git a/src/BRepTest/BRepTest_ExtremaCommands.cxx b/src/BRepTest/BRepTest_ExtremaCommands.cxx index 395c8e22c2..bddb92657a 100644 --- a/src/BRepTest/BRepTest_ExtremaCommands.cxx +++ b/src/BRepTest/BRepTest_ExtremaCommands.cxx @@ -33,7 +33,7 @@ #include -//#ifdef WNT +//#ifdef _MSC_VER #include //#endif diff --git a/src/BRepTest/BRepTest_GPropCommands.cxx b/src/BRepTest/BRepTest_GPropCommands.cxx index 86f0b1c421..2e2bc52b38 100644 --- a/src/BRepTest/BRepTest_GPropCommands.cxx +++ b/src/BRepTest/BRepTest_GPropCommands.cxx @@ -33,7 +33,7 @@ #include #include -#ifdef WNT +#ifdef _WIN32 Standard_IMPORT Draw_Viewer dout; #endif diff --git a/src/BRepTest/BRepTest_MatCommands.cxx b/src/BRepTest/BRepTest_MatCommands.cxx index 11083e44ee..7a4d8c14ae 100644 --- a/src/BRepTest/BRepTest_MatCommands.cxx +++ b/src/BRepTest/BRepTest_MatCommands.cxx @@ -50,7 +50,7 @@ #include #include -#ifdef WNT +#ifdef _WIN32 Standard_IMPORT Draw_Viewer dout; #endif diff --git a/src/BRepTest/BRepTest_ProjectionCommands.cxx b/src/BRepTest/BRepTest_ProjectionCommands.cxx index 0501c4825b..9caf045a31 100644 --- a/src/BRepTest/BRepTest_ProjectionCommands.cxx +++ b/src/BRepTest/BRepTest_ProjectionCommands.cxx @@ -24,9 +24,8 @@ #include #include #include -//#ifdef WNT #include -//#endif + static Standard_Integer prj(Draw_Interpretor& di, Standard_Integer n, const char** a) { char newname[255]; diff --git a/src/BRepTest/BRepTest_SweepCommands.cxx b/src/BRepTest/BRepTest_SweepCommands.cxx index ef1329cec5..4c1203b8b5 100644 --- a/src/BRepTest/BRepTest_SweepCommands.cxx +++ b/src/BRepTest/BRepTest_SweepCommands.cxx @@ -44,7 +44,6 @@ static BRepOffsetAPI_MakePipeShell* Sweep= 0; -//#ifdef WNT #include #include #include @@ -53,7 +52,6 @@ static BRepOffsetAPI_MakePipeShell* Sweep= 0; #include #include #include -//#endi#include #include #include #include diff --git a/src/BRepTools/BRepTools_ShapeSet.cxx b/src/BRepTools/BRepTools_ShapeSet.cxx index bba6e7dbd0..526c021b07 100644 --- a/src/BRepTools/BRepTools_ShapeSet.cxx +++ b/src/BRepTools/BRepTools_ShapeSet.cxx @@ -58,7 +58,7 @@ #ifdef MacOS #define strcasecmp(p,q) strcmp(p,q) -#elseif WNT +#elseif _WIN32 #define strcasecmp strcmp #elseif AIX #include diff --git a/src/BRepTopAdaptor/BRepTopAdaptor_FClass2d.cxx b/src/BRepTopAdaptor/BRepTopAdaptor_FClass2d.cxx index 3cb4edea3a..af8e377c98 100644 --- a/src/BRepTopAdaptor/BRepTopAdaptor_FClass2d.cxx +++ b/src/BRepTopAdaptor/BRepTopAdaptor_FClass2d.cxx @@ -42,7 +42,7 @@ #include #include -#ifdef WNT +#ifdef _MSC_VER #include #endif diff --git a/src/Blend/Blend_Debug.cxx b/src/Blend/Blend_Debug.cxx index a3b716ae09..5ea6ee3d13 100644 --- a/src/Blend/Blend_Debug.cxx +++ b/src/Blend/Blend_Debug.cxx @@ -17,7 +17,7 @@ #include #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*/ //************************************************* diff --git a/src/Bnd/Bnd_BoundSortBox.cxx b/src/Bnd/Bnd_BoundSortBox.cxx index 99d80f270f..497ab1dfed 100644 --- a/src/Bnd/Bnd_BoundSortBox.cxx +++ b/src/Bnd/Bnd_BoundSortBox.cxx @@ -25,8 +25,6 @@ #include #include -//#if defined(WNT) || defined(LIN) -//#endif // WNT //-- ================================================================================ //-- lbr le 27 fev 97 //-- diff --git a/src/CDF/CDF_FWOSDriver.cxx b/src/CDF/CDF_FWOSDriver.cxx index feb5ddb60b..c5172537cf 100644 --- a/src/CDF/CDF_FWOSDriver.cxx +++ b/src/CDF/CDF_FWOSDriver.cxx @@ -25,9 +25,9 @@ #include #include -#ifdef WNT +#ifdef _MSC_VER #include -#endif // WNT +#endif // _MSC_VER //============================================================================== @@ -35,11 +35,11 @@ //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++) diff --git a/src/CDF/CDF_Store.cxx b/src/CDF/CDF_Store.cxx index 5338669e0f..9a44647dfb 100644 --- a/src/CDF/CDF_Store.cxx +++ b/src/CDF/CDF_Store.cxx @@ -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) == '\\') diff --git a/src/DBRep/DBRep_DrawableShape.cxx b/src/DBRep/DBRep_DrawableShape.cxx index 634fc02dd5..36e7b6596f 100644 --- a/src/DBRep/DBRep_DrawableShape.cxx +++ b/src/DBRep/DBRep_DrawableShape.cxx @@ -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 diff --git a/src/DDF/DDF_BrowserCommands.cxx b/src/DDF/DDF_BrowserCommands.cxx index ec7013b810..0e4c5e24cb 100644 --- a/src/DDF/DDF_BrowserCommands.cxx +++ b/src/DDF/DDF_BrowserCommands.cxx @@ -33,7 +33,7 @@ #include #include -#ifdef WNT +#ifdef _MSC_VER #include #endif diff --git a/src/DDF/DDF_IOStream.hxx b/src/DDF/DDF_IOStream.hxx index 8fe47f2da8..de41a7976a 100644 --- a/src/DDF/DDF_IOStream.hxx +++ b/src/DDF/DDF_IOStream.hxx @@ -222,7 +222,7 @@ ostream* myOStream; }; -#ifdef WNT +#ifdef _MSC_VER #pragma warning (default : 4275) #endif diff --git a/src/DDataStd/DDataStd_BasicCommands.cxx b/src/DDataStd/DDataStd_BasicCommands.cxx index 91b3967449..19b0bfe662 100644 --- a/src/DDataStd/DDataStd_BasicCommands.cxx +++ b/src/DDataStd/DDataStd_BasicCommands.cxx @@ -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); diff --git a/src/DDataStd/DDataStd_DrawDisplayCommands.cxx b/src/DDataStd/DDataStd_DrawDisplayCommands.cxx index 94eeefc7cb..518d5b3922 100644 --- a/src/DDataStd/DDataStd_DrawDisplayCommands.cxx +++ b/src/DDataStd/DDataStd_DrawDisplayCommands.cxx @@ -52,7 +52,7 @@ #include #include -#ifndef WNT +#ifndef _WIN32 extern Draw_Viewer dout; #else Standard_IMPORT Draw_Viewer dout; diff --git a/src/DDataStd/DDataStd_DrawPresentation.cxx b/src/DDataStd/DDataStd_DrawPresentation.cxx index dd19c0e02d..8867cf27eb 100644 --- a/src/DDataStd/DDataStd_DrawPresentation.cxx +++ b/src/DDataStd/DDataStd_DrawPresentation.cxx @@ -31,7 +31,7 @@ #include #include -#ifndef WNT +#ifndef _WIN32 extern Draw_Viewer dout; #else Standard_IMPORT Draw_Viewer dout; diff --git a/src/DNaming/DNaming_BasicCommands.cxx b/src/DNaming/DNaming_BasicCommands.cxx index d834692c7d..d5f03349f8 100644 --- a/src/DNaming/DNaming_BasicCommands.cxx +++ b/src/DNaming/DNaming_BasicCommands.cxx @@ -53,7 +53,7 @@ #include #include -//#ifdef WNT +//#ifdef _MSC_VER #include //#endif diff --git a/src/DNaming/DNaming_ModelingCommands.cxx b/src/DNaming/DNaming_ModelingCommands.cxx index ddf159f85b..366df6c144 100644 --- a/src/DNaming/DNaming_ModelingCommands.cxx +++ b/src/DNaming/DNaming_ModelingCommands.cxx @@ -71,7 +71,7 @@ #include #include #include -#ifdef WNT +#ifdef _WIN32 #define EXCEPTION ... #else #define EXCEPTION Standard_Failure diff --git a/src/DNaming/DNaming_TransformationDriver.cxx b/src/DNaming/DNaming_TransformationDriver.cxx index 897f1ddb7b..698b09b946 100644 --- a/src/DNaming/DNaming_TransformationDriver.cxx +++ b/src/DNaming/DNaming_TransformationDriver.cxx @@ -53,7 +53,7 @@ #include #include -#ifdef WNT +#ifdef _WIN32 #define EXCEPTION ... #else #define EXCEPTION Standard_Failure diff --git a/src/DPrsStd/DPrsStd.cxx b/src/DPrsStd/DPrsStd.cxx index 421f68d53f..5cfefb5c6f 100644 --- a/src/DPrsStd/DPrsStd.cxx +++ b/src/DPrsStd/DPrsStd.cxx @@ -32,7 +32,7 @@ //#include // avoid warnings on 'extern "C"' functions returning C++ classes -#ifdef WNT +#ifdef _MSC_VER #pragma warning(4:4190) #endif //static Handle(AppStdL_Application) stdApp; diff --git a/src/Draw/COMMANDWINDOW.h b/src/Draw/COMMANDWINDOW.h index c47ac06e7f..6077ca198d 100644 --- a/src/Draw/COMMANDWINDOW.h +++ b/src/Draw/COMMANDWINDOW.h @@ -14,7 +14,7 @@ commercial license or contractual agreement. */ -#ifdef WNT +#ifdef _WIN32 #define COMMANDCLASS "COMMANDWINDOW" diff --git a/src/Draw/CommandWindow.cxx b/src/Draw/CommandWindow.cxx index 347c43264e..420279139a 100644 --- a/src/Draw/CommandWindow.cxx +++ b/src/Draw/CommandWindow.cxx @@ -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 #define COMMANDCLASS "COMMANDWINDOW" diff --git a/src/Draw/Draw.cxx b/src/Draw/Draw.cxx index c1be3acda4..f859e9b6ab 100644 --- a/src/Draw/Draw.cxx +++ b/src/Draw/Draw.cxx @@ -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"; diff --git a/src/Draw/DrawRessource.h b/src/Draw/DrawRessource.h index 9100a2b2b3..0b542ee2d9 100644 --- a/src/Draw/DrawRessource.h +++ b/src/Draw/DrawRessource.h @@ -14,7 +14,7 @@ commercial license or contractual agreement. */ -#ifdef WNT +#ifdef _MSC_VER //{{NO_DEPENDENCIES}} // Microsoft Developer Studio generated include file. diff --git a/src/Draw/Draw_Appli.hxx b/src/Draw/Draw_Appli.hxx index 1045022d3a..4df133cf8e 100644 --- a/src/Draw/Draw_Appli.hxx +++ b/src/Draw/Draw_Appli.hxx @@ -29,7 +29,7 @@ typedef void (*FDraw_InitAppli)(Draw_Interpretor&); -#ifdef WNT +#ifdef _WIN32 #include //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 diff --git a/src/Draw/Draw_Grid.cxx b/src/Draw/Draw_Grid.cxx index b9ee5b10e5..e5c8cd87cc 100644 --- a/src/Draw/Draw_Grid.cxx +++ b/src/Draw/Draw_Grid.cxx @@ -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 diff --git a/src/Draw/Draw_Interpretor.cxx b/src/Draw/Draw_Interpretor.cxx index df09c8bdf6..fef27edd73 100644 --- a/src/Draw/Draw_Interpretor.cxx +++ b/src/Draw/Draw_Interpretor.cxx @@ -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 diff --git a/src/Draw/Draw_Main.cxx b/src/Draw/Draw_Main.cxx index c63bc69d13..66b51684da 100644 --- a/src/Draw/Draw_Main.cxx +++ b/src/Draw/Draw_Main.cxx @@ -53,7 +53,7 @@ #include -#ifdef WNT +#ifdef _WIN32 #include #include @@ -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 diff --git a/src/Draw/Draw_Main.hxx b/src/Draw/Draw_Main.hxx index ce693a61ff..79c6d1acb4 100644 --- a/src/Draw/Draw_Main.hxx +++ b/src/Draw/Draw_Main.hxx @@ -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);} diff --git a/src/Draw/Draw_Viewer.cxx b/src/Draw/Draw_Viewer.cxx index 430a48e79b..9f5f031a5e 100644 --- a/src/Draw/Draw_Viewer.cxx +++ b/src/Draw/Draw_Viewer.cxx @@ -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 diff --git a/src/Draw/Draw_Viewer.hxx b/src/Draw/Draw_Viewer.hxx index 0c2b8463de..c6a80b680b 100644 --- a/src/Draw/Draw_Viewer.hxx +++ b/src/Draw/Draw_Viewer.hxx @@ -29,7 +29,7 @@ #include #include -#ifdef WNT +#ifdef _WIN32 #include #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 diff --git a/src/Draw/Draw_Window.cxx b/src/Draw/Draw_Window.cxx index ddebf5a682..918465da8d 100644 --- a/src/Draw/Draw_Window.cxx +++ b/src/Draw/Draw_Window.cxx @@ -15,7 +15,7 @@ // commercial license or contractual agreement. // include windows.h first to have all definitions available -#ifdef WNT +#ifdef _WIN32 #include #endif diff --git a/src/Draw/MAINWINDOW.h b/src/Draw/MAINWINDOW.h index 72dda55568..c894bd48f0 100644 --- a/src/Draw/MAINWINDOW.h +++ b/src/Draw/MAINWINDOW.h @@ -19,7 +19,7 @@ /** MainWindow.h */ /*\****************************************************/ -#ifdef WNT +#ifdef _WIN32 #define CLIENTWND 0 diff --git a/src/Draw/MainWindow.cxx b/src/Draw/MainWindow.cxx index e3ce014115..b188bbbfa4 100644 --- a/src/Draw/MainWindow.cxx +++ b/src/Draw/MainWindow.cxx @@ -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 #include diff --git a/src/Draw/init.cxx b/src/Draw/init.cxx index 72806e19f2..aea8e87d9d 100644 --- a/src/Draw/init.cxx +++ b/src/Draw/init.cxx @@ -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 diff --git a/src/Draw/init.h b/src/Draw/init.h index e18aa604d3..4e41748624 100644 --- a/src/Draw/init.h +++ b/src/Draw/init.h @@ -14,7 +14,7 @@ commercial license or contractual agreement. */ -#ifdef WNT +#ifdef _WIN32 #define APPCLASS "TDRAW" #define APPTITLE "Windows NT TDRAW" diff --git a/src/DrawDim/DrawDim.cxx b/src/DrawDim/DrawDim.cxx index 0ff9f21577..b2a86dec13 100644 --- a/src/DrawDim/DrawDim.cxx +++ b/src/DrawDim/DrawDim.cxx @@ -39,7 +39,7 @@ #include #include -#ifdef WNT +#ifdef _WIN32 Standard_IMPORT Draw_Viewer dout; #endif diff --git a/src/DrawDim/DrawDim_PlanarDimensionCommands.cxx b/src/DrawDim/DrawDim_PlanarDimensionCommands.cxx index 37732511c5..24513537fa 100644 --- a/src/DrawDim/DrawDim_PlanarDimensionCommands.cxx +++ b/src/DrawDim/DrawDim_PlanarDimensionCommands.cxx @@ -42,7 +42,7 @@ #include #include #include -#ifdef WNT +#ifdef _MSC_VER #include #endif //======================================================================= diff --git a/src/DrawTrSurf/DrawTrSurf_Triangulation.cxx b/src/DrawTrSurf/DrawTrSurf_Triangulation.cxx index a812716185..217a51471e 100644 --- a/src/DrawTrSurf/DrawTrSurf_Triangulation.cxx +++ b/src/DrawTrSurf/DrawTrSurf_Triangulation.cxx @@ -29,8 +29,6 @@ #include #include -//#ifdef WNT -//#endif //======================================================================= //function : DrawTrSurf_Triangulation //purpose : diff --git a/src/DrawTrSurf/DrawTrSurf_Triangulation2D.cxx b/src/DrawTrSurf/DrawTrSurf_Triangulation2D.cxx index 963b47c18e..727085d0ea 100644 --- a/src/DrawTrSurf/DrawTrSurf_Triangulation2D.cxx +++ b/src/DrawTrSurf/DrawTrSurf_Triangulation2D.cxx @@ -29,7 +29,7 @@ #include #include -#ifdef WNT +#ifdef _MSC_VER #include #endif diff --git a/src/DsgPrs/DsgPrs_FilletRadiusPresentation.cxx b/src/DsgPrs/DsgPrs_FilletRadiusPresentation.cxx index 032b4d6110..feedd30f81 100644 --- a/src/DsgPrs/DsgPrs_FilletRadiusPresentation.cxx +++ b/src/DsgPrs/DsgPrs_FilletRadiusPresentation.cxx @@ -46,9 +46,6 @@ #include #include -//pop pour NT -//#if WNT -//#endif //======================================================================= //function : Add //purpose : diff --git a/src/Expr/Expr_Operators.hxx b/src/Expr/Expr_Operators.hxx index af068c5b60..5451e5892e 100644 --- a/src/Expr/Expr_Operators.hxx +++ b/src/Expr/Expr_Operators.hxx @@ -26,7 +26,7 @@ #include #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); diff --git a/src/ExprIntrp/ExprIntrp_yaccanal.hxx b/src/ExprIntrp/ExprIntrp_yaccanal.hxx index 89008bfc7c..8ab0eacea1 100644 --- a/src/ExprIntrp/ExprIntrp_yaccanal.hxx +++ b/src/ExprIntrp/ExprIntrp_yaccanal.hxx @@ -20,7 +20,7 @@ #include #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 diff --git a/src/ExprIntrp/ExprIntrp_yacclex.cxx b/src/ExprIntrp/ExprIntrp_yacclex.cxx index 596ed77136..76079a2e06 100644 --- a/src/ExprIntrp/ExprIntrp_yacclex.cxx +++ b/src/ExprIntrp/ExprIntrp_yacclex.cxx @@ -20,11 +20,11 @@ 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() diff --git a/src/ExprIntrp/lex.ExprIntrp.c b/src/ExprIntrp/lex.ExprIntrp.c index 0ac7fbef81..fa1f37beb1 100644 --- a/src/ExprIntrp/lex.ExprIntrp.c +++ b/src/ExprIntrp/lex.ExprIntrp.c @@ -28,10 +28,10 @@ #include -#ifdef WNT +#ifdef _MSC_VER # include # include -#endif /* WNT */ +#endif /* _MSC_VER */ diff --git a/src/GeomToIGES/GeomToIGES_GeomSurface.cxx b/src/GeomToIGES/GeomToIGES_GeomSurface.cxx index 1f9c09279f..87cfdc2b55 100644 --- a/src/GeomToIGES/GeomToIGES_GeomSurface.cxx +++ b/src/GeomToIGES/GeomToIGES_GeomSurface.cxx @@ -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); diff --git a/src/GeometryTest/GeometryTest_API2dCommands.cxx b/src/GeometryTest/GeometryTest_API2dCommands.cxx index fb0a522eae..5210f6fd4b 100644 --- a/src/GeometryTest/GeometryTest_API2dCommands.cxx +++ b/src/GeometryTest/GeometryTest_API2dCommands.cxx @@ -36,7 +36,7 @@ #include #include -#ifdef WNT +#ifdef _WIN32 Standard_IMPORT Draw_Viewer dout; #endif diff --git a/src/GeometryTest/GeometryTest_APICommands.cxx b/src/GeometryTest/GeometryTest_APICommands.cxx index e5e6c23e88..dbc77b292f 100644 --- a/src/GeometryTest/GeometryTest_APICommands.cxx +++ b/src/GeometryTest/GeometryTest_APICommands.cxx @@ -39,7 +39,7 @@ #include #include #include -#ifdef WNT +#ifdef _WIN32 Standard_IMPORT Draw_Viewer dout; #endif diff --git a/src/GeometryTest/GeometryTest_ConstraintCommands.cxx b/src/GeometryTest/GeometryTest_ConstraintCommands.cxx index cf647cc280..204fe3d935 100644 --- a/src/GeometryTest/GeometryTest_ConstraintCommands.cxx +++ b/src/GeometryTest/GeometryTest_ConstraintCommands.cxx @@ -64,9 +64,8 @@ #include #include -//#ifdef WNT #include -#ifdef WNT +#ifdef _WIN32 Standard_IMPORT Draw_Viewer dout; #endif Standard_IMPORT Draw_Color DrawTrSurf_CurveColor(const Draw_Color); diff --git a/src/GeometryTest/GeometryTest_CurveCommands.cxx b/src/GeometryTest/GeometryTest_CurveCommands.cxx index 03004ffd08..2ff026b60c 100644 --- a/src/GeometryTest/GeometryTest_CurveCommands.cxx +++ b/src/GeometryTest/GeometryTest_CurveCommands.cxx @@ -130,7 +130,7 @@ #include #include -#ifdef WNT +#ifdef _WIN32 Standard_IMPORT Draw_Viewer dout; #endif diff --git a/src/GeometryTest/GeometryTest_PolyCommands.cxx b/src/GeometryTest/GeometryTest_PolyCommands.cxx index 66c5a4873a..5eaabdbd65 100644 --- a/src/GeometryTest/GeometryTest_PolyCommands.cxx +++ b/src/GeometryTest/GeometryTest_PolyCommands.cxx @@ -29,7 +29,7 @@ #include #include -#ifdef WNT +#ifdef _WIN32 Standard_IMPORT Draw_Viewer dout; #endif //======================================================================= diff --git a/src/GeometryTest/GeometryTest_SurfaceCommands.cxx b/src/GeometryTest/GeometryTest_SurfaceCommands.cxx index 2e6ea7d639..b378b57158 100644 --- a/src/GeometryTest/GeometryTest_SurfaceCommands.cxx +++ b/src/GeometryTest/GeometryTest_SurfaceCommands.cxx @@ -61,9 +61,12 @@ #include #include -#ifdef WNT +#ifdef _MSC_VER #include //#define strcasecmp strcmp Already defined +#endif + +#ifdef _WIN32 Standard_IMPORT Draw_Viewer dout; #endif diff --git a/src/GeometryTest/GeometryTest_TestProjCommands.cxx b/src/GeometryTest/GeometryTest_TestProjCommands.cxx index cfbb43e921..5ec57e08a2 100644 --- a/src/GeometryTest/GeometryTest_TestProjCommands.cxx +++ b/src/GeometryTest/GeometryTest_TestProjCommands.cxx @@ -27,7 +27,7 @@ #include #include -#ifdef WNT +#ifdef _WIN32 Standard_IMPORT Draw_Viewer dout; #endif diff --git a/src/GeomliteTest/GeomliteTest_API2dCommands.cxx b/src/GeomliteTest/GeomliteTest_API2dCommands.cxx index e499762bf5..084c495e97 100644 --- a/src/GeomliteTest/GeomliteTest_API2dCommands.cxx +++ b/src/GeomliteTest/GeomliteTest_API2dCommands.cxx @@ -44,7 +44,7 @@ #include #include -#ifdef WNT +#ifdef _WIN32 Standard_IMPORT Draw_Viewer dout; #endif diff --git a/src/GeomliteTest/GeomliteTest_ApproxCommands.cxx b/src/GeomliteTest/GeomliteTest_ApproxCommands.cxx index b1925023f5..5568d00e6c 100644 --- a/src/GeomliteTest/GeomliteTest_ApproxCommands.cxx +++ b/src/GeomliteTest/GeomliteTest_ApproxCommands.cxx @@ -60,8 +60,11 @@ #include #include -#ifdef WNT +#ifdef _MSC_VER #include +#endif + +#ifdef _WIN32 Standard_IMPORT Draw_Viewer dout; #endif diff --git a/src/GeomliteTest/GeomliteTest_CurveCommands.cxx b/src/GeomliteTest/GeomliteTest_CurveCommands.cxx index 54f44e5dcd..161086771f 100644 --- a/src/GeomliteTest/GeomliteTest_CurveCommands.cxx +++ b/src/GeomliteTest/GeomliteTest_CurveCommands.cxx @@ -108,7 +108,7 @@ #include #include #include -#ifdef WNT +#ifdef _WIN32 Standard_IMPORT Draw_Viewer dout; #endif diff --git a/src/GeomliteTest/GeomliteTest_ModificationCommands.cxx b/src/GeomliteTest/GeomliteTest_ModificationCommands.cxx index 68dbea05d4..1c649cada9 100644 --- a/src/GeomliteTest/GeomliteTest_ModificationCommands.cxx +++ b/src/GeomliteTest/GeomliteTest_ModificationCommands.cxx @@ -33,7 +33,7 @@ #include #include -#ifdef WNT +#ifdef _MSC_VER #include //#define strcasecmp strcmp Already defined #endif diff --git a/src/GeomliteTest/GeomliteTest_SurfaceCommands.cxx b/src/GeomliteTest/GeomliteTest_SurfaceCommands.cxx index 174c2c0e17..edbf114007 100644 --- a/src/GeomliteTest/GeomliteTest_SurfaceCommands.cxx +++ b/src/GeomliteTest/GeomliteTest_SurfaceCommands.cxx @@ -82,10 +82,8 @@ #include #include -//#ifdef WNT #include #ifdef _WIN32 -//#define strcasecmp strcmp Already defined Standard_IMPORT Draw_Viewer dout; #endif diff --git a/src/HLRTest/HLRTest.cxx b/src/HLRTest/HLRTest.cxx index 5dab025cfb..bc6e17498a 100644 --- a/src/HLRTest/HLRTest.cxx +++ b/src/HLRTest/HLRTest.cxx @@ -31,7 +31,7 @@ #include static Handle(HLRBRep_Algo) hider; -#ifdef WNT +#ifdef _WIN32 Standard_IMPORT Draw_Viewer dout; #endif diff --git a/src/IGESToBRep/IGESToBRep_Reader.cxx b/src/IGESToBRep/IGESToBRep_Reader.cxx index 091f8a8d8e..755669c568 100644 --- a/src/IGESToBRep/IGESToBRep_Reader.cxx +++ b/src/IGESToBRep/IGESToBRep_Reader.cxx @@ -62,7 +62,7 @@ #include //#include -#ifdef WNT +#ifdef _MSC_VER #include #else #include diff --git a/src/IntImp/IntImp_ComputeTangence.hxx b/src/IntImp/IntImp_ComputeTangence.hxx index 3de2e98e97..650ac1a608 100644 --- a/src/IntImp/IntImp_ComputeTangence.hxx +++ b/src/IntImp/IntImp_ComputeTangence.hxx @@ -15,7 +15,7 @@ #include #include -#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; diff --git a/src/IntTools/IntTools.cxx b/src/IntTools/IntTools.cxx index 97953ee78b..ecaf16fd83 100644 --- a/src/IntTools/IntTools.cxx +++ b/src/IntTools/IntTools.cxx @@ -377,6 +377,6 @@ namespace { return 1; } -#ifdef WNT +#ifdef _MSC_VER #pragma warning ( default : 4101 ) #endif diff --git a/src/IntTools/IntTools_EdgeFace.cxx b/src/IntTools/IntTools_EdgeFace.cxx index afc09228f1..a03518e591 100644 --- a/src/IntTools/IntTools_EdgeFace.cxx +++ b/src/IntTools/IntTools_EdgeFace.cxx @@ -1545,6 +1545,6 @@ Standard_Integer AdaptiveDiscret (const Standard_Integer iDiscret, } -#ifdef WNT +#ifdef _MSC_VER #pragma warning ( default : 4101 ) #endif diff --git a/src/Interface/Interface_CheckTool.cxx b/src/Interface/Interface_CheckTool.cxx index ff9b9248bd..47ad1d8cd2 100644 --- a/src/Interface/Interface_CheckTool.cxx +++ b/src/Interface/Interface_CheckTool.cxx @@ -32,7 +32,7 @@ #include #include -#ifdef WNT +#ifdef _WIN32 #include #else #include @@ -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))) diff --git a/src/Interface/Interface_FileReaderTool.cxx b/src/Interface/Interface_FileReaderTool.cxx index 2fa4473735..7f0edbe476 100644 --- a/src/Interface/Interface_FileReaderTool.cxx +++ b/src/Interface/Interface_FileReaderTool.cxx @@ -36,7 +36,7 @@ #include #include -#ifdef WNT +#ifdef _WIN32 #include #else #include @@ -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; diff --git a/src/LDOM/LDOMBasicString.cxx b/src/LDOM/LDOMBasicString.cxx index f5613408f4..c30b3f16a5 100644 --- a/src/LDOM/LDOMBasicString.cxx +++ b/src/LDOM/LDOMBasicString.cxx @@ -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 or pp " //======================================================================= diff --git a/src/LDOM/LDOMParser.cxx b/src/LDOM/LDOMParser.cxx index 0d28c7bd51..432aaf4394 100644 --- a/src/LDOM/LDOMParser.cxx +++ b/src/LDOM/LDOMParser.cxx @@ -26,7 +26,7 @@ #include #include -#ifdef WNT +#ifdef _MSC_VER #include #else #include @@ -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"; diff --git a/src/LDOM/LDOM_BasicNode.cxx b/src/LDOM/LDOM_BasicNode.cxx index cdd57eab8e..5d6ee6368d 100644 --- a/src/LDOM/LDOM_BasicNode.cxx +++ b/src/LDOM/LDOM_BasicNode.cxx @@ -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 or pp " //======================================================================= diff --git a/src/LDOM/LDOM_XmlReader.cxx b/src/LDOM/LDOM_XmlReader.cxx index a4a5f11bb0..6e4d8a62f0 100644 --- a/src/LDOM/LDOM_XmlReader.cxx +++ b/src/LDOM/LDOM_XmlReader.cxx @@ -25,7 +25,7 @@ #include #include -#ifdef WNT +#ifdef _MSC_VER #include #else #include diff --git a/src/LDOM/LDOM_XmlWriter.cxx b/src/LDOM/LDOM_XmlWriter.cxx index bf0968555c..2c10b63135 100644 --- a/src/LDOM/LDOM_XmlWriter.cxx +++ b/src/LDOM/LDOM_XmlWriter.cxx @@ -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 diff --git a/src/MAT2d/MAT2d_MapBiIntHasher.lxx b/src/MAT2d/MAT2d_MapBiIntHasher.lxx index 81ecf09e67..30b0601073 100644 --- a/src/MAT2d/MAT2d_MapBiIntHasher.lxx +++ b/src/MAT2d/MAT2d_MapBiIntHasher.lxx @@ -21,36 +21,19 @@ //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 diff --git a/src/MeshTest/MeshTest.cxx b/src/MeshTest/MeshTest.cxx index 58e9607c09..3800fb2441 100644 --- a/src/MeshTest/MeshTest.cxx +++ b/src/MeshTest/MeshTest.cxx @@ -84,7 +84,7 @@ #include //epa Memory leaks test //OAN: for triepoints -#ifdef WNT +#ifdef _WIN32 Standard_IMPORT Draw_Viewer dout; #endif diff --git a/src/MeshVS/MeshVS_TextPrsBuilder.cxx b/src/MeshVS/MeshVS_TextPrsBuilder.cxx index e9ab6165dd..7793861f71 100644 --- a/src/MeshVS/MeshVS_TextPrsBuilder.cxx +++ b/src/MeshVS/MeshVS_TextPrsBuilder.cxx @@ -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"; diff --git a/src/Message/Message_MsgFile.cxx b/src/Message/Message_MsgFile.cxx index ef6163d635..48320b8897 100644 --- a/src/Message/Message_MsgFile.cxx +++ b/src/Message/Message_MsgFile.cxx @@ -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 += '/'; diff --git a/src/OSD/OSD.cxx b/src/OSD/OSD.cxx index a43b9b4788..66ec9ca553 100644 --- a/src/OSD/OSD.cxx +++ b/src/OSD/OSD.cxx @@ -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 #if !defined(__CYGWIN32__) && !defined(__MINGW32__) //# include @@ -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 diff --git a/src/OSD/OSD_Chronometer.cxx b/src/OSD/OSD_Chronometer.cxx index d45d0a98da..509aee6bda 100644 --- a/src/OSD/OSD_Chronometer.cxx +++ b/src/OSD/OSD_Chronometer.cxx @@ -19,7 +19,7 @@ #include // ====================== 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 ======================== diff --git a/src/OSD/OSD_Directory.cxx b/src/OSD/OSD_Directory.cxx index 34708bc069..ed5c03c9de 100644 --- a/src/OSD/OSD_Directory.cxx +++ b/src/OSD/OSD_Directory.cxx @@ -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 diff --git a/src/OSD/OSD_DirectoryIterator.cxx b/src/OSD/OSD_DirectoryIterator.cxx index d1ca52b911..b5f1c5d211 100644 --- a/src/OSD/OSD_DirectoryIterator.cxx +++ b/src/OSD/OSD_DirectoryIterator.cxx @@ -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 diff --git a/src/OSD/OSD_Environment.cxx b/src/OSD/OSD_Environment.cxx index d1832f54e9..fdc9638f20 100644 --- a/src/OSD/OSD_Environment.cxx +++ b/src/OSD/OSD_Environment.cxx @@ -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 diff --git a/src/OSD/OSD_Error.cxx b/src/OSD/OSD_Error.cxx index 8b2b4a21a2..d805237f85 100755 --- a/src/OSD/OSD_Error.cxx +++ b/src/OSD/OSD_Error.cxx @@ -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 diff --git a/src/OSD/OSD_FileIterator.cxx b/src/OSD/OSD_FileIterator.cxx index 174a4c179b..c5b32d9820 100644 --- a/src/OSD/OSD_FileIterator.cxx +++ b/src/OSD/OSD_FileIterator.cxx @@ -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 diff --git a/src/OSD/OSD_Host.cxx b/src/OSD/OSD_Host.cxx index e71caa90a2..fbba8342d4 100644 --- a/src/OSD/OSD_Host.cxx +++ b/src/OSD/OSD_Host.cxx @@ -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 diff --git a/src/OSD/OSD_MAllocHook.cxx b/src/OSD/OSD_MAllocHook.cxx index 81dd2d6f58..f5f8a8e163 100644 --- a/src/OSD/OSD_MAllocHook.cxx +++ b/src/OSD/OSD_MAllocHook.cxx @@ -15,7 +15,7 @@ #include -#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 #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 diff --git a/src/OSD/OSD_PThread.hxx b/src/OSD/OSD_PThread.hxx index dcd8cbda05..ddc83f800a 100644 --- a/src/OSD/OSD_PThread.hxx +++ b/src/OSD/OSD_PThread.hxx @@ -18,7 +18,7 @@ // Platform-dependent definition of the thread handle type -#ifdef WNT +#ifdef _WIN32 #include typedef HANDLE OSD_PThread; diff --git a/src/OSD/OSD_Path.cxx b/src/OSD/OSD_Path.cxx index f324bed9fb..cb9f999f8d 100644 --- a/src/OSD/OSD_Path.cxx +++ b/src/OSD/OSD_Path.cxx @@ -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) diff --git a/src/OSD/OSD_Printer.cxx b/src/OSD/OSD_Printer.cxx index 94f67b547b..91dad41881 100644 --- a/src/OSD/OSD_Printer.cxx +++ b/src/OSD/OSD_Printer.cxx @@ -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 diff --git a/src/OSD/OSD_Process.cxx b/src/OSD/OSD_Process.cxx index 1c620c6be8..9eb168ba2a 100644 --- a/src/OSD/OSD_Process.cxx +++ b/src/OSD/OSD_Process.cxx @@ -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 diff --git a/src/OSD/OSD_Protection.cxx b/src/OSD/OSD_Protection.cxx index 17d2c2df88..69816a4c7d 100644 --- a/src/OSD/OSD_Protection.cxx +++ b/src/OSD/OSD_Protection.cxx @@ -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 diff --git a/src/OSD/OSD_SharedLibrary.cxx b/src/OSD/OSD_SharedLibrary.cxx index 90e4ac938a..aa5d472b16 100644 --- a/src/OSD/OSD_SharedLibrary.cxx +++ b/src/OSD/OSD_SharedLibrary.cxx @@ -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 diff --git a/src/OSD/OSD_Thread.cxx b/src/OSD/OSD_Thread.cxx index 96c631e65b..35f2a08798 100644 --- a/src/OSD/OSD_Thread.cxx +++ b/src/OSD/OSD_Thread.cxx @@ -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 // 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(); diff --git a/src/OSD/OSD_ThreadFunction.hxx b/src/OSD/OSD_ThreadFunction.hxx index 0a42edaaea..2fd6c524ce 100644 --- a/src/OSD/OSD_ThreadFunction.hxx +++ b/src/OSD/OSD_ThreadFunction.hxx @@ -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 //typedef LPTHREAD_START_ROUTINE OSD_ThreadFunction; //#else diff --git a/src/OSD/OSD_Timer.cxx b/src/OSD/OSD_Timer.cxx index 4a7b83ea12..b011a4fbc9 100644 --- a/src/OSD/OSD_Timer.cxx +++ b/src/OSD/OSD_Timer.cxx @@ -21,7 +21,7 @@ #include -#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 ======================== diff --git a/src/OSD/OSD_WNT.cxx b/src/OSD/OSD_WNT.cxx index 8ae67d1207..06b9b23f38 100644 --- a/src/OSD/OSD_WNT.cxx +++ b/src/OSD/OSD_WNT.cxx @@ -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 */ diff --git a/src/OSD/OSD_WNT_BREAK.hxx b/src/OSD/OSD_WNT_BREAK.hxx index c513375b8d..8ccfa6327c 100644 --- a/src/OSD/OSD_WNT_BREAK.hxx +++ b/src/OSD/OSD_WNT_BREAK.hxx @@ -15,10 +15,10 @@ #ifndef __OSD_WNT_BREAK_HXX # define __OSD_WNT_BREAK_HXX -# ifdef WNT +# ifdef _WIN32 # include # define _TSTBRK() OSD :: ControlBreak () -# endif // WNT +# endif // _WIN32 #endif // __OSD_WNT_BREAK_HXX diff --git a/src/OSD/OSD_signal.cxx b/src/OSD/OSD_signal.cxx index 8a87e3d44f..9046a673c8 100644 --- a/src/OSD/OSD_signal.cxx +++ b/src/OSD/OSD_signal.cxx @@ -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 diff --git a/src/OSD/OSD_signal_WNT.cxx b/src/OSD/OSD_signal_WNT.cxx index 4347cd13be..163661363c 100644 --- a/src/OSD/OSD_signal_WNT.cxx +++ b/src/OSD/OSD_signal_WNT.cxx @@ -598,4 +598,4 @@ LONG _osd_debug ( void ) { #undef __finally #undef __leave #endif -#endif // WNT +#endif // _WIN32 diff --git a/src/OpenGl/OpenGl_AVIWriter.hxx b/src/OpenGl/OpenGl_AVIWriter.hxx index 2d0af0f914..ba4d3976c9 100644 --- a/src/OpenGl/OpenGl_AVIWriter.hxx +++ b/src/OpenGl/OpenGl_AVIWriter.hxx @@ -16,7 +16,7 @@ #ifndef __OPENGL_AVIWRITER_H #define __OPENGL_AVIWRITER_H -#ifdef WNT +#ifdef _MSC_VER #define THIS void #include @@ -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 diff --git a/src/OpenGl/OpenGl_Window.cxx b/src/OpenGl/OpenGl_Window.cxx index 4d99800c67..0572c09893 100644 --- a/src/OpenGl/OpenGl_Window.cxx +++ b/src/OpenGl/OpenGl_Window.cxx @@ -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 diff --git a/src/PCDM/PCDM_ReadWriter_1.cxx b/src/PCDM/PCDM_ReadWriter_1.cxx index f0081f3bbd..323448362d 100644 --- a/src/PCDM/PCDM_ReadWriter_1.cxx +++ b/src/PCDM/PCDM_ReadWriter_1.cxx @@ -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("\\"); diff --git a/src/PCDM/PCDM_ReferenceIterator.cxx b/src/PCDM/PCDM_ReferenceIterator.cxx index 0b80250310..79b0d8e4da 100644 --- a/src/PCDM/PCDM_ReferenceIterator.cxx +++ b/src/PCDM/PCDM_ReferenceIterator.cxx @@ -27,9 +27,9 @@ #include #include -#ifdef WNT +#ifdef _MSC_VER # include -#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)); } diff --git a/src/Plugin/Plugin.cxx b/src/Plugin/Plugin.cxx index 37ba0193a0..069b7cfc28 100644 --- a/src/Plugin/Plugin.cxx +++ b/src/Plugin/Plugin.cxx @@ -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"; diff --git a/src/Poly/Poly_CoherentNode.cxx b/src/Poly/Poly_CoherentNode.cxx index 05876123ba..a23188ac4e 100644 --- a/src/Poly/Poly_CoherentNode.cxx +++ b/src/Poly/Poly_CoherentNode.cxx @@ -16,7 +16,7 @@ #include #include -#ifdef WNT +#ifdef _MSC_VER #pragma warning(disable:4996) #endif diff --git a/src/Poly/Poly_CoherentTriPtr.hxx b/src/Poly/Poly_CoherentTriPtr.hxx index 9f1fd1b2c3..49f4a17887 100644 --- a/src/Poly/Poly_CoherentTriPtr.hxx +++ b/src/Poly/Poly_CoherentTriPtr.hxx @@ -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 diff --git a/src/QABugs/QABugs_1.cxx b/src/QABugs/QABugs_1.cxx index edc7cd4ee5..99539a8ab7 100644 --- a/src/QABugs/QABugs_1.cxx +++ b/src/QABugs/QABugs_1.cxx @@ -39,7 +39,7 @@ #include #include -#ifndef WNT +#ifndef _WIN32 extern Draw_Viewer dout; #else Standard_IMPORT Draw_Viewer dout; @@ -51,7 +51,7 @@ Standard_IMPORT Draw_Viewer dout; #include #include -#if ! defined(WNT) +#if ! defined(_WIN32) extern ViewerTest_DoubleMapOfInteractiveAndName& GetMapOfAIS(); #else Standard_EXPORT ViewerTest_DoubleMapOfInteractiveAndName& GetMapOfAIS(); diff --git a/src/QABugs/QABugs_16.cxx b/src/QABugs/QABugs_16.cxx index cc79a1e5ad..8f31685a18 100644 --- a/src/QABugs/QABugs_16.cxx +++ b/src/QABugs/QABugs_16.cxx @@ -80,7 +80,7 @@ #include #include -#if ! defined(WNT) +#if ! defined(_WIN32) extern ViewerTest_DoubleMapOfInteractiveAndName& GetMapOfAIS(); #else Standard_EXPORT ViewerTest_DoubleMapOfInteractiveAndName& GetMapOfAIS(); diff --git a/src/QABugs/QABugs_19.cxx b/src/QABugs/QABugs_19.cxx index dbba1866bf..cead6a144f 100644 --- a/src/QABugs/QABugs_19.cxx +++ b/src/QABugs/QABugs_19.cxx @@ -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 #include #include -#ifdef WNT +#ifdef _WIN32 #define EXCEPTION ... #else #define EXCEPTION Standard_Failure diff --git a/src/QABugs/QABugs_3.cxx b/src/QABugs/QABugs_3.cxx index b4438aff67..87ce5db80f 100644 --- a/src/QABugs/QABugs_3.cxx +++ b/src/QABugs/QABugs_3.cxx @@ -125,7 +125,7 @@ static int BUC60614(Draw_Interpretor& di, Standard_Integer argc, const char ** a #include #include #include -#ifdef WNT +#ifdef _MSC_VER #include #endif diff --git a/src/QABugs/QABugs_9.cxx b/src/QABugs/QABugs_9.cxx index 4d31d01e98..e0f5145903 100644 --- a/src/QABugs/QABugs_9.cxx +++ b/src/QABugs/QABugs_9.cxx @@ -71,7 +71,7 @@ static Standard_Integer BUC60857 (Draw_Interpretor& di, Standard_Integer /*argc* #include #include #include -#if ! defined(WNT) +#if ! defined(_WIN32) extern ViewerTest_DoubleMapOfInteractiveAndName& GetMapOfAIS(); #else Standard_EXPORT ViewerTest_DoubleMapOfInteractiveAndName& GetMapOfAIS(); diff --git a/src/QADNaming/QADNaming_BasicCommands.cxx b/src/QADNaming/QADNaming_BasicCommands.cxx index 7404c8b940..4552227249 100644 --- a/src/QADNaming/QADNaming_BasicCommands.cxx +++ b/src/QADNaming/QADNaming_BasicCommands.cxx @@ -50,7 +50,7 @@ #include #include -//#ifdef WNT +//#ifdef _MSC_VER #include //#endif diff --git a/src/Quantity/Quantity_Convert.lxx b/src/Quantity/Quantity_Convert.lxx index f6854fafc9..b75c5b5e57 100644 --- a/src/Quantity/Quantity_Convert.lxx +++ b/src/Quantity/Quantity_Convert.lxx @@ -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 diff --git a/src/STEPConstruct/STEPConstruct_AP203Context.cxx b/src/STEPConstruct/STEPConstruct_AP203Context.cxx index ce615a09bd..d57da3a770 100644 --- a/src/STEPConstruct/STEPConstruct_AP203Context.cxx +++ b/src/STEPConstruct/STEPConstruct_AP203Context.cxx @@ -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 ); diff --git a/src/Standard/Standard_ErrorHandler.cxx b/src/Standard/Standard_ErrorHandler.cxx index 236a9d2d8f..7a4616cc97 100644 --- a/src/Standard/Standard_ErrorHandler.cxx +++ b/src/Standard/Standard_ErrorHandler.cxx @@ -22,7 +22,7 @@ #include #include -#ifndef WNT +#ifndef _WIN32 #include #else #include @@ -47,7 +47,7 @@ static Standard_Mutex theMutex; static inline Standard_ThreadId GetThreadID() { -#ifndef WNT +#ifndef _WIN32 return pthread_self(); #else return GetCurrentThreadId(); diff --git a/src/Standard/Standard_MMgrOpt.cxx b/src/Standard/Standard_MMgrOpt.cxx index 49652da8e7..45ae9287c1 100644 --- a/src/Standard/Standard_MMgrOpt.cxx +++ b/src/Standard/Standard_MMgrOpt.cxx @@ -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); diff --git a/src/Standard/Standard_MMgrTBBalloc.cxx b/src/Standard/Standard_MMgrTBBalloc.cxx index b7eec7dd5d..de1d4b0596 100644 --- a/src/Standard/Standard_MMgrTBBalloc.cxx +++ b/src/Standard/Standard_MMgrTBBalloc.cxx @@ -16,11 +16,6 @@ #include #include -// NOTE: replaced by more correct check -//#if defined(WNT) || defined(LIN) -//#define HAVE_TBB 1 -//#endif - // paralleling with Intel TBB #ifdef HAVE_TBB #include diff --git a/src/Standard/Standard_Macro.hxx b/src/Standard/Standard_Macro.hxx index 78faf57b2e..d7be33170c 100644 --- a/src/Standard/Standard_Macro.hxx +++ b/src/Standard/Standard_Macro.hxx @@ -33,11 +33,6 @@ // 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 @@ -123,14 +118,13 @@ #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 @@ -138,9 +132,6 @@ # define __Standard_API Standard_IMPORT # define __Standard_APIEXTERN Standard_IMPORT # endif // __Standard_DLL -//# else -//# define __Standard_API -//# endif // WNT # endif // __Standard_API #endif diff --git a/src/Standard/Standard_ThreadId.hxx b/src/Standard/Standard_ThreadId.hxx index 2e4048b654..a129f3886a 100644 --- a/src/Standard/Standard_ThreadId.hxx +++ b/src/Standard/Standard_ThreadId.hxx @@ -18,7 +18,7 @@ // Platform-dependent definition of the thread identifier type -#ifdef WNT +#ifdef _WIN32 #include typedef DWORD Standard_ThreadId; diff --git a/src/Standard/Standard_UUID.hxx b/src/Standard/Standard_UUID.hxx index 6d2eb593fd..9a863ec4c7 100644 --- a/src/Standard/Standard_UUID.hxx +++ b/src/Standard/Standard_UUID.hxx @@ -17,7 +17,7 @@ #include -#ifdef WNT +#ifdef _WIN32 #include #else typedef struct { diff --git a/src/Standard/Standard_values.h b/src/Standard/Standard_values.h index 696a7a5a2b..b51b98f362 100644 --- a/src/Standard/Standard_values.h +++ b/src/Standard/Standard_values.h @@ -17,10 +17,6 @@ #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 #else diff --git a/src/StepFile/lex.step.c b/src/StepFile/lex.step.c index 080ad931a5..66baa717ce 100644 --- a/src/StepFile/lex.step.c +++ b/src/StepFile/lex.step.c @@ -28,10 +28,10 @@ #include -#ifdef WNT +#ifdef _MSC_VER # include # include -#endif /* WNT */ +#endif /* _MSC_VER */ diff --git a/src/StepFile/step.tab.c b/src/StepFile/step.tab.c index b0e8232266..4a574f028f 100644 --- a/src/StepFile/step.tab.c +++ b/src/StepFile/step.tab.c @@ -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 diff --git a/src/TDF/TDF_LabelMapHasher.lxx b/src/TDF/TDF_LabelMapHasher.lxx index c2ff9e9c3e..dccf6c6706 100644 --- a/src/TDF/TDF_LabelMapHasher.lxx +++ b/src/TDF/TDF_LabelMapHasher.lxx @@ -25,11 +25,7 @@ //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); } diff --git a/src/TDataStd/TDataStd_NamedData.cxx b/src/TDataStd/TDataStd_NamedData.cxx index 295c6add4c..14f7c8e568 100644 --- a/src/TDataStd/TDataStd_NamedData.cxx +++ b/src/TDataStd/TDataStd_NamedData.cxx @@ -34,7 +34,7 @@ #include #include -#ifdef WNT +#ifdef _WIN32 #define EXCEPTION ... #else #define EXCEPTION Standard_Failure diff --git a/src/TDocStd/TDocStd_PathParser.cxx b/src/TDocStd/TDocStd_PathParser.cxx index a9bb2fe2d4..eba6f7203e 100644 --- a/src/TDocStd/TDocStd_PathParser.cxx +++ b/src/TDocStd/TDocStd_PathParser.cxx @@ -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 = "./"; diff --git a/src/TNaming/TNaming_Localizer.cxx b/src/TNaming/TNaming_Localizer.cxx index dfd71e3c36..4f705bee21 100644 --- a/src/TNaming/TNaming_Localizer.cxx +++ b/src/TNaming/TNaming_Localizer.cxx @@ -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); diff --git a/src/TNaming/TNaming_NamingTool.cxx b/src/TNaming/TNaming_NamingTool.cxx index 389848a63b..056c75bc83 100644 --- a/src/TNaming/TNaming_NamingTool.cxx +++ b/src/TNaming/TNaming_NamingTool.cxx @@ -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); diff --git a/src/TNaming/TNaming_Selector.cxx b/src/TNaming/TNaming_Selector.cxx index 1747c65c3c..d18f7661cb 100644 --- a/src/TNaming/TNaming_Selector.cxx +++ b/src/TNaming/TNaming_Selector.cxx @@ -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); diff --git a/src/TObj/TObj_Model.cxx b/src/TObj/TObj_Model.cxx index 4479c98c2c..84f956243d 100644 --- a/src/TObj/TObj_Model.cxx +++ b/src/TObj/TObj_Model.cxx @@ -43,7 +43,7 @@ #include #include -#ifdef WNT +#ifdef _MSC_VER #include #else #include diff --git a/src/TObjDRAW/TObjDRAW.cxx b/src/TObjDRAW/TObjDRAW.cxx index 770cb05330..778949b358 100644 --- a/src/TObjDRAW/TObjDRAW.cxx +++ b/src/TObjDRAW/TObjDRAW.cxx @@ -35,7 +35,7 @@ #include // avoid warnings on 'extern "C"' functions returning C++ classes -#ifdef WNT +#ifdef _MSC_VER #pragma warning(4:4190) #endif diff --git a/src/TestTopOpe/TestTopOpe.cxx b/src/TestTopOpe/TestTopOpe.cxx index b896070d7e..5fcb3f663c 100644 --- a/src/TestTopOpe/TestTopOpe.cxx +++ b/src/TestTopOpe/TestTopOpe.cxx @@ -30,7 +30,7 @@ #include #include -#ifdef WNT +#ifdef _MSC_VER #pragma warning(4:4190) #endif diff --git a/src/TestTopOpe/TestTopOpe_BOOP.cxx b/src/TestTopOpe/TestTopOpe_BOOP.cxx index df743d7a2c..0d9d43878c 100644 --- a/src/TestTopOpe/TestTopOpe_BOOP.cxx +++ b/src/TestTopOpe/TestTopOpe_BOOP.cxx @@ -44,7 +44,7 @@ #include #include #include -#ifdef WNT +#ifdef _WIN32 Standard_IMPORT Draw_Viewer dout; #endif diff --git a/src/TestTopOpe/TestTopOpe_MesureCommands.cxx b/src/TestTopOpe/TestTopOpe_MesureCommands.cxx index 3ee4178496..f7777d5ff0 100644 --- a/src/TestTopOpe/TestTopOpe_MesureCommands.cxx +++ b/src/TestTopOpe/TestTopOpe_MesureCommands.cxx @@ -29,7 +29,7 @@ #include #include -#ifdef WNT +#ifdef _WIN32 Standard_IMPORT Draw_Viewer dout; #endif diff --git a/src/TestTopOpeDraw/TestTopOpeDraw_Displayer.cxx b/src/TestTopOpeDraw/TestTopOpeDraw_Displayer.cxx index 277b2f44cc..7387723121 100644 --- a/src/TestTopOpeDraw/TestTopOpeDraw_Displayer.cxx +++ b/src/TestTopOpeDraw/TestTopOpeDraw_Displayer.cxx @@ -31,7 +31,7 @@ #include #include -#ifdef WNT +#ifdef _WIN32 Standard_IMPORT Draw_Viewer dout; #endif diff --git a/src/TopExp/TopExp_Explorer.cxx b/src/TopExp/TopExp_Explorer.cxx index 8eebf7519a..f698f928cc 100644 --- a/src/TopExp/TopExp_Explorer.cxx +++ b/src/TopExp/TopExp_Explorer.cxx @@ -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 diff --git a/src/TopOpeBRep/TopOpeBRep.cxx b/src/TopOpeBRep/TopOpeBRep.cxx index 9b37bd5b96..803f09019c 100644 --- a/src/TopOpeBRep/TopOpeBRep.cxx +++ b/src/TopOpeBRep/TopOpeBRep.cxx @@ -18,7 +18,7 @@ #include -//#ifdef WNT +//#ifdef _WIN32 //#define strcasecmp strcmp Already defined //#endif //======================================================================= diff --git a/src/TopOpeBRep/TopOpeBRep_FacesIntersector.cxx b/src/TopOpeBRep/TopOpeBRep_FacesIntersector.cxx index 46b701100d..2d86e74e2b 100644 --- a/src/TopOpeBRep/TopOpeBRep_FacesIntersector.cxx +++ b/src/TopOpeBRep/TopOpeBRep_FacesIntersector.cxx @@ -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 diff --git a/src/Units/Units_Lexicon.cxx b/src/Units/Units_Lexicon.cxx index e18fa77810..77013e6dda 100644 --- a/src/Units/Units_Lexicon.cxx +++ b/src/Units/Units_Lexicon.cxx @@ -24,11 +24,11 @@ #include #include -#ifdef WNT +#ifdef _MSC_VER # include #else #include -#endif // WNT +#endif // _MSC_VER //======================================================================= //function : Units_Lexicon diff --git a/src/UnitsAPI/UnitsAPI.cxx b/src/UnitsAPI/UnitsAPI.cxx index aa3c37ca2e..ee4da11a9a 100644 --- a/src/UnitsAPI/UnitsAPI.cxx +++ b/src/UnitsAPI/UnitsAPI.cxx @@ -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()); diff --git a/src/V3d/V3d_View_Print.cxx b/src/V3d/V3d_View_Print.cxx index c0316af23e..dede6b0e4b 100644 --- a/src/V3d/V3d_View_Print.cxx +++ b/src/V3d/V3d_View_Print.cxx @@ -18,7 +18,7 @@ /* Includes */ /************************************************************************/ -#ifdef WNT +#ifdef _WIN32 #include #pragma comment( lib, "comdlg32.lib" ) #endif @@ -44,7 +44,7 @@ #include #include -#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) diff --git a/src/ViewerTest/ViewerTest.cxx b/src/ViewerTest/ViewerTest.cxx index 0028b3c53e..69e3e017d7 100644 --- a/src/ViewerTest/ViewerTest.cxx +++ b/src/ViewerTest/ViewerTest.cxx @@ -76,7 +76,7 @@ #include // 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) diff --git a/src/ViewerTest/ViewerTest_ViewerCommands.cxx b/src/ViewerTest/ViewerTest_ViewerCommands.cxx index 8fb76db93e..64aef0ad56 100644 --- a/src/ViewerTest/ViewerTest_ViewerCommands.cxx +++ b/src/ViewerTest/ViewerTest_ViewerCommands.cxx @@ -70,7 +70,7 @@ #include #include -#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 diff --git a/src/VrmlData/VrmlData_Geometry.cxx b/src/VrmlData/VrmlData_Geometry.cxx index e36e774ffa..36a7c6c174 100644 --- a/src/VrmlData/VrmlData_Geometry.cxx +++ b/src/VrmlData/VrmlData_Geometry.cxx @@ -33,7 +33,7 @@ #include #include -#ifdef WNT +#ifdef _MSC_VER #define _CRT_SECURE_NO_DEPRECATE #pragma warning (disable:4996) #endif diff --git a/src/VrmlData/VrmlData_Group.cxx b/src/VrmlData/VrmlData_Group.cxx index e296250398..1cb2ca1fac 100644 --- a/src/VrmlData/VrmlData_Group.cxx +++ b/src/VrmlData/VrmlData_Group.cxx @@ -23,7 +23,7 @@ #include #include -#ifdef WNT +#ifdef _MSC_VER #define _CRT_SECURE_NO_DEPRECATE #pragma warning (disable:4996) #endif diff --git a/src/VrmlData/VrmlData_IndexedFaceSet.cxx b/src/VrmlData/VrmlData_IndexedFaceSet.cxx index 992e30c7ee..04b73d93f5 100644 --- a/src/VrmlData/VrmlData_IndexedFaceSet.cxx +++ b/src/VrmlData/VrmlData_IndexedFaceSet.cxx @@ -29,7 +29,7 @@ #include #include -#ifdef WNT +#ifdef _MSC_VER #define _CRT_SECURE_NO_DEPRECATE #pragma warning (disable:4996) #endif diff --git a/src/VrmlData/VrmlData_IndexedLineSet.cxx b/src/VrmlData/VrmlData_IndexedLineSet.cxx index 4e711a7ed0..474f46aab2 100644 --- a/src/VrmlData/VrmlData_IndexedLineSet.cxx +++ b/src/VrmlData/VrmlData_IndexedLineSet.cxx @@ -26,7 +26,7 @@ #include #include -#ifdef WNT +#ifdef _MSC_VER #define _CRT_SECURE_NO_DEPRECATE #pragma warning (disable:4996) #endif diff --git a/src/VrmlData/VrmlData_Material.cxx b/src/VrmlData/VrmlData_Material.cxx index 06b0a99ee8..474ead27c6 100644 --- a/src/VrmlData/VrmlData_Material.cxx +++ b/src/VrmlData/VrmlData_Material.cxx @@ -19,7 +19,7 @@ #include #include -#ifdef WNT +#ifdef _MSC_VER #define _CRT_SECURE_NO_DEPRECATE #pragma warning (disable:4996) #endif diff --git a/src/VrmlData/VrmlData_Node.cxx b/src/VrmlData/VrmlData_Node.cxx index 9707e6d96e..54b4cfd27d 100644 --- a/src/VrmlData/VrmlData_Node.cxx +++ b/src/VrmlData/VrmlData_Node.cxx @@ -27,7 +27,7 @@ #include #include -#ifdef WNT +#ifdef _MSC_VER #define _CRT_SECURE_NO_DEPRECATE #pragma warning (disable:4996) #endif diff --git a/src/VrmlData/VrmlData_Scene.cxx b/src/VrmlData/VrmlData_Scene.cxx index bd94a4a3e3..a1e3a51210 100644 --- a/src/VrmlData/VrmlData_Scene.cxx +++ b/src/VrmlData/VrmlData_Scene.cxx @@ -46,7 +46,7 @@ #include #include -#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 ("/"); diff --git a/src/VrmlData/VrmlData_WorldInfo.cxx b/src/VrmlData/VrmlData_WorldInfo.cxx index 900562341e..96fe6193c8 100644 --- a/src/VrmlData/VrmlData_WorldInfo.cxx +++ b/src/VrmlData/VrmlData_WorldInfo.cxx @@ -17,7 +17,7 @@ #include #include -#ifdef WNT +#ifdef _MSC_VER #define _CRT_SECURE_NO_DEPRECATE #pragma warning (disable:4996) #endif diff --git a/src/XDEDRAW/XDEDRAW.cxx b/src/XDEDRAW/XDEDRAW.cxx index 825e926c8f..092fc1b42b 100644 --- a/src/XDEDRAW/XDEDRAW.cxx +++ b/src/XDEDRAW/XDEDRAW.cxx @@ -92,7 +92,7 @@ #include #define ZVIEW_SIZE 1000000.0 // avoid warnings on 'extern "C"' functions returning C++ classes -#ifdef WNT +#ifdef _MSC_VER #pragma warning(4:4190) #endif diff --git a/src/XSDRAWSTLVRML/XSDRAWSTLVRML.cxx b/src/XSDRAWSTLVRML/XSDRAWSTLVRML.cxx index 86fa0cceb0..c5ef90770e 100644 --- a/src/XSDRAWSTLVRML/XSDRAWSTLVRML.cxx +++ b/src/XSDRAWSTLVRML/XSDRAWSTLVRML.cxx @@ -69,7 +69,7 @@ #include // avoid warnings on 'extern "C"' functions returning C++ classes -#ifdef WNT +#ifdef _MSC_VER #pragma warning(4:4190) #endif diff --git a/src/XmlLDrivers/XmlLDrivers_DocumentRetrievalDriver.cxx b/src/XmlLDrivers/XmlLDrivers_DocumentRetrievalDriver.cxx index a6323c89ee..a62f7cc02f 100644 --- a/src/XmlLDrivers/XmlLDrivers_DocumentRetrievalDriver.cxx +++ b/src/XmlLDrivers/XmlLDrivers_DocumentRetrievalDriver.cxx @@ -40,9 +40,9 @@ #include #include -#ifdef WNT +#ifdef _MSC_VER # include -#endif // WNT +#endif // _MSC_VER #include #include @@ -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 #include #include -#ifndef WNT +#ifndef _WIN32 extern "C" int ftime (struct timeb *tp); #endif extern struct timeb tmbuf0; diff --git a/src/XmlLDrivers/XmlLDrivers_DocumentStorageDriver.cxx b/src/XmlLDrivers/XmlLDrivers_DocumentStorageDriver.cxx index 2e9e9ecb26..c34bad172b 100644 --- a/src/XmlLDrivers/XmlLDrivers_DocumentStorageDriver.cxx +++ b/src/XmlLDrivers/XmlLDrivers_DocumentStorageDriver.cxx @@ -380,7 +380,7 @@ Handle(XmlMDF_ADriverTable) XmlLDrivers_DocumentStorageDriver::AttributeDrivers #include #include #include -#ifndef WNT +#ifndef _WIN32 extern "C" int ftime (struct timeb *tp); #endif struct timeb tmbuf0; diff --git a/src/XmlMDataStd/XmlMDataStd_NamedDataDriver.cxx b/src/XmlMDataStd/XmlMDataStd_NamedDataDriver.cxx index b3794a4147..2aab64ca08 100644 --- a/src/XmlMDataStd/XmlMDataStd_NamedDataDriver.cxx +++ b/src/XmlMDataStd/XmlMDataStd_NamedDataDriver.cxx @@ -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 diff --git a/src/math/math_FunctionRoots.cxx b/src/math/math_FunctionRoots.cxx index 2a88363a1c..43903ba4d6 100644 --- a/src/math/math_FunctionRoots.cxx +++ b/src/math/math_FunctionRoots.cxx @@ -27,8 +27,6 @@ #include #include -//#ifdef WNT -//#endif #define ITMAX 100 #define EPS 1e-14 #define EPSEPS 2e-14 diff --git a/src/math/math_Recipes.hxx b/src/math/math_Recipes.hxx index 5a06863a19..da361f2c5e 100644 --- a/src/math/math_Recipes.hxx +++ b/src/math/math_Recipes.hxx @@ -20,7 +20,7 @@ #include #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;