1) Macro definition WNT replaced by _WIN32 and _MSC_VER for platform and compiler detection accordingly.
2) Macro definition LIN replaced by __linux__ macro.
3) Macro definition DEB replaced by OCCT_DEBUG macro.
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
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
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)
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
# 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"
}
# 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"
}
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<Optimization>MaxSpeed</Optimization>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;WNT;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>NDEBUG;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<ExceptionHandling>Async</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
</ClCompile>
<ResourceCompile>
<AdditionalIncludeDirectories>..\..\..\inc;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;WNT;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>NDEBUG;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ResourceCompile>
<Link>
<AdditionalDependencies>__TKDEP__;ws2_32.lib;vfw32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<Optimization>Disabled</Optimization>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <PreprocessorDefinitions>DEB;_DEBUG;WIN32;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>_DEBUG;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<AssemblerListingLocation>.\..\..\..\win32\__VCVER__\objd\__TKNAM__/</AssemblerListingLocation>
</ClCompile>
<ResourceCompile>
<AdditionalIncludeDirectories>..\..\..\inc;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>DEB;_DEBUG;WIN32;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>_DEBUG;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ResourceCompile>
<Link>
<AdditionalDependencies>__TKDEP__;ws2_32.lib;vfw32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<Optimization>MaxSpeed</Optimization>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <PreprocessorDefinitions>NDEBUG;WIN64;_WINDOWS;WNT;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>NDEBUG;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<ExceptionHandling>Async</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
</ClCompile>
<ResourceCompile>
<AdditionalIncludeDirectories>..\..\..\inc;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>NDEBUG;WIN64;_WINDOWS;WNT;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>NDEBUG;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ResourceCompile>
<Link>
<AdditionalDependencies>__TKDEP__;ws2_32.lib;vfw32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<Optimization>Disabled</Optimization>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <PreprocessorDefinitions>DEB;_DEBUG;WIN64;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>_DEBUG;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<AssemblerListingLocation>.\..\..\..\win64\__VCVER__\objd\__TKNAM__/</AssemblerListingLocation>
</ClCompile>
<ResourceCompile>
<AdditionalIncludeDirectories>..\..\..\inc;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>DEB;_DEBUG;WIN64;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>_DEBUG;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ResourceCompile>
<Link>
<AdditionalDependencies>__TKDEP__;ws2_32.lib;vfw32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<Optimization>MaxSpeed</Optimization>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;WNT;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>NDEBUG;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<ExceptionHandling>Async</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
</ClCompile>
<ResourceCompile>
<AdditionalIncludeDirectories>..\..\..\inc;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;WNT;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>NDEBUG;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ResourceCompile>
<Link>
<AdditionalDependencies>__TKDEP__;%(AdditionalDependencies)</AdditionalDependencies>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<Optimization>Disabled</Optimization>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <PreprocessorDefinitions>DEB;_DEBUG;WIN32;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>_DEBUG;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<AssemblerListingLocation>.\..\..\..\win32\__VCVER__\objd\__XQTNAM__/</AssemblerListingLocation>
</ClCompile>
<ResourceCompile>
<AdditionalIncludeDirectories>..\..\..\inc;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>DEB;_DEBUG;WIN32;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>_DEBUG;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ResourceCompile>
<Link>
<AdditionalDependencies>__TKDEP__;%(AdditionalDependencies)</AdditionalDependencies>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<Optimization>MaxSpeed</Optimization>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <PreprocessorDefinitions>NDEBUG;WIN64;_WINDOWS;WNT;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>NDEBUG;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<ExceptionHandling>Async</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
</ClCompile>
<ResourceCompile>
<AdditionalIncludeDirectories>..\..\..\inc;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>NDEBUG;WIN64;_WINDOWS;WNT;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>NDEBUG;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ResourceCompile>
<Link>
<AdditionalDependencies>__TKDEP__;%(AdditionalDependencies)</AdditionalDependencies>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<Optimization>Disabled</Optimization>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <PreprocessorDefinitions>DEB;_DEBUG;WIN64;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>_DEBUG;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<AssemblerListingLocation>.\..\..\..\win64\__VCVER__\objd\__XQTNAM__/</AssemblerListingLocation>
</ClCompile>
<ResourceCompile>
<AdditionalIncludeDirectories>..\..\..\inc;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>DEB;_DEBUG;WIN64;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>_DEBUG;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ResourceCompile>
<Link>
<AdditionalDependencies>__TKDEP__;%(AdditionalDependencies)</AdditionalDependencies>
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"
<Tool
Name="VCResourceCompilerTool"
AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
- PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;WNT;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__"
+ PreprocessorDefinitions="NDEBUG;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__"
Culture="1036"/>
<Tool
Name="VCWebServiceProxyGeneratorTool"/>
AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
Optimization="0"
InlineFunctionExpansion="1"
- PreprocessorDefinitions="DEB;_DEBUG;WIN32;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__"
- BasicRuntimeChecks="3"
+ PreprocessorDefinitions="_DEBUG;CSFDB;$(CSF_DEFINES)__TKDEFS__"
+ BasicRuntimeChecks="3"
RuntimeLibrary="3"
PrecompiledHeaderFile=".\..\..\..\win32\vc7\objd\__TKNAM__\__TKNAM__.pch"
AssemblerListingLocation=".\..\..\..\win32\vc7\objd\__TKNAM__/"
<Tool
Name="VCResourceCompilerTool"
AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
- PreprocessorDefinitions="DEB;_DEBUG;WIN32;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__"
+ PreprocessorDefinitions="_DEBUG;CSFDB;$(CSF_DEFINES)__TKDEFS__"
Culture="1036"/>
<Tool
Name="VCWebServiceProxyGeneratorTool"/>
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__/"
<Tool
Name="VCResourceCompilerTool"
AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
- PreprocessorDefinitions="WIN32;DEB;_DEBUG;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__"
+ PreprocessorDefinitions="_DEBUG;CSFDB;$(CSF_DEFINES)__TKDEFS__"
Culture="1033"/>
<Tool
Name="VCWebServiceProxyGeneratorTool"/>
AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
Optimization="2"
InlineFunctionExpansion="1"
- PreprocessorDefinitions="WIN32;NDEBUG;No_Exception;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__"
+ PreprocessorDefinitions="NDEBUG;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__"
StringPooling="TRUE"
RuntimeLibrary="2"
EnableFunctionLevelLinking="TRUE"
<Tool
Name="VCResourceCompilerTool"
AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
- PreprocessorDefinitions="WIN32;NDEBUG;No_Exception;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__"
+ PreprocessorDefinitions="NDEBUG;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__"
Culture="1033"/>
<Tool
Name="VCWebServiceProxyGeneratorTool"/>
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"
<Tool
Name="VCResourceCompilerTool"
AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
- PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;WNT;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__"
+ PreprocessorDefinitions="NDEBUG;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__"
Culture="1036"
/>
<Tool
AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
Optimization="0"
InlineFunctionExpansion="1"
- PreprocessorDefinitions="DEB;_DEBUG;WIN32;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__"
+ PreprocessorDefinitions="_DEBUG;CSFDB;$(CSF_DEFINES)__TKDEFS__"
ExceptionHandling="2"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
<Tool
Name="VCResourceCompilerTool"
AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
- PreprocessorDefinitions="DEB;_DEBUG;WIN32;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__"
+ PreprocessorDefinitions="_DEBUG;CSFDB;$(CSF_DEFINES)__TKDEFS__"
Culture="1036"
/>
<Tool
AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
Optimization="2"
InlineFunctionExpansion="1"
- PreprocessorDefinitions="NDEBUG;WIN64;_WINDOWS;WNT;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__"
+ PreprocessorDefinitions="NDEBUG;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__"
StringPooling="true"
ExceptionHandling="2"
RuntimeLibrary="2"
<Tool
Name="VCResourceCompilerTool"
AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
- PreprocessorDefinitions="NDEBUG;WIN64;_WINDOWS;WNT;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__"
+ PreprocessorDefinitions="NDEBUG;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__"
Culture="1036"
/>
<Tool
AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
Optimization="0"
InlineFunctionExpansion="1"
- PreprocessorDefinitions="DEB;_DEBUG;WIN64;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__"
+ PreprocessorDefinitions="_DEBUG;CSFDB;$(CSF_DEFINES)__TKDEFS__"
ExceptionHandling="2"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
<Tool
Name="VCResourceCompilerTool"
AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
- PreprocessorDefinitions="DEB;_DEBUG;WIN64;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__"
+ PreprocessorDefinitions="_DEBUG;CSFDB;$(CSF_DEFINES)__TKDEFS__"
Culture="1036"
/>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
Optimization="0"
- PreprocessorDefinitions="WIN32;DEB;_DEBUG;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__;"
+ PreprocessorDefinitions="_DEBUG;CSFDB;$(CSF_DEFINES)__TKDEFS__;"
ExceptionHandling="2"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
<Tool
Name="VCResourceCompilerTool"
AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
- PreprocessorDefinitions="WIN32;DEB;_DEBUG;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__;"
+ PreprocessorDefinitions="_DEBUG;CSFDB;$(CSF_DEFINES)__TKDEFS__;"
Culture="1033"
/>
<Tool
AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
Optimization="2"
InlineFunctionExpansion="1"
- PreprocessorDefinitions="WIN32;NDEBUG;No_Exception;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__;"
+ PreprocessorDefinitions="NDEBUG;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__;"
StringPooling="true"
ExceptionHandling="2"
RuntimeLibrary="2"
<Tool
Name="VCResourceCompilerTool"
AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
- PreprocessorDefinitions="WIN32;NDEBUG;No_Exception;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__;"
+ PreprocessorDefinitions="NDEBUG;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__;"
Culture="1033"
/>
<Tool
AdditionalOptions="/favor:blend"
AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
Optimization="0"
- PreprocessorDefinitions="WIN64;DEB;_DEBUG;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__"
+ PreprocessorDefinitions="_DEBUG;CSFDB;$(CSF_DEFINES)__TKDEFS__"
ExceptionHandling="2"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
<Tool
Name="VCResourceCompilerTool"
AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
- PreprocessorDefinitions="WIN64;DEB;_DEBUG;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__"
+ PreprocessorDefinitions="_DEBUG;CSFDB;$(CSF_DEFINES)__TKDEFS__"
Culture="1033"
/>
<Tool
AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
Optimization="2"
InlineFunctionExpansion="1"
- PreprocessorDefinitions="WIN64;NDEBUG;No_Exception;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__"
+ PreprocessorDefinitions="NDEBUG;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__"
StringPooling="true"
ExceptionHandling="2"
RuntimeLibrary="2"
<Tool
Name="VCResourceCompilerTool"
AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
- PreprocessorDefinitions="WIN64;NDEBUG;No_Exception;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__"
+ PreprocessorDefinitions="NDEBUG;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__"
Culture="1033"
/>
<Tool
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"
<Tool
Name="VCResourceCompilerTool"
AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
- PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;WNT;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__"
+ PreprocessorDefinitions="NDEBUG;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__"
/>
<Tool
Name="VCPreLinkEventTool"
AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
Optimization="0"
InlineFunctionExpansion="1"
- PreprocessorDefinitions="DEB;_DEBUG;WIN32;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__"
+ PreprocessorDefinitions="_DEBUG;CSFDB;$(CSF_DEFINES)__TKDEFS__"
ExceptionHandling="2"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
<Tool
Name="VCResourceCompilerTool"
AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
- PreprocessorDefinitions="DEB;_DEBUG;WIN32;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__"
+ PreprocessorDefinitions="_DEBUG;CSFDB;$(CSF_DEFINES)__TKDEFS__"
/>
<Tool
Name="VCPreLinkEventTool"
AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
Optimization="2"
InlineFunctionExpansion="1"
- PreprocessorDefinitions="NDEBUG;WIN64;_WINDOWS;WNT;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__"
+ PreprocessorDefinitions="NDEBUG;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__"
StringPooling="true"
ExceptionHandling="2"
RuntimeLibrary="2"
<Tool
Name="VCResourceCompilerTool"
AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
- PreprocessorDefinitions="NDEBUG;WIN64;_WINDOWS;WNT;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__"
+ PreprocessorDefinitions="NDEBUG;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__"
/>
<Tool
Name="VCPreLinkEventTool"
AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
Optimization="0"
InlineFunctionExpansion="1"
- PreprocessorDefinitions="DEB;_DEBUG;WIN64;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__"
+ PreprocessorDefinitions="_DEBUG;CSFDB;$(CSF_DEFINES)__TKDEFS__"
ExceptionHandling="2"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
<Tool
Name="VCResourceCompilerTool"
AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
- PreprocessorDefinitions="DEB;_DEBUG;WIN64;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__"
+ PreprocessorDefinitions="_DEBUG;CSFDB;$(CSF_DEFINES)__TKDEFS__"
/>
<Tool
Name="VCPreLinkEventTool"
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"
<Tool
Name="VCResourceCompilerTool"
AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
- PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;WNT;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__"
+ PreprocessorDefinitions="NDEBUG;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__"
/>
<Tool
Name="VCPreLinkEventTool"
AdditionalOptions="-MP"
AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
Optimization="0"
- PreprocessorDefinitions="DEB;_DEBUG;WIN32;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__"
+ PreprocessorDefinitions="_DEBUG;CSFDB;$(CSF_DEFINES)__TKDEFS__"
ExceptionHandling="2"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
<Tool
Name="VCResourceCompilerTool"
AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
- PreprocessorDefinitions="DEB;_DEBUG;WIN32;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__"
+ PreprocessorDefinitions="_DEBUG;CSFDB;$(CSF_DEFINES)__TKDEFS__"
/>
<Tool
Name="VCPreLinkEventTool"
AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
Optimization="2"
InlineFunctionExpansion="1"
- PreprocessorDefinitions="WIN64;NDEBUG;No_Exception;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__"
+ PreprocessorDefinitions="NDEBUG;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__"
StringPooling="true"
ExceptionHandling="2"
RuntimeLibrary="2"
<Tool
Name="VCResourceCompilerTool"
AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
- PreprocessorDefinitions="WIN64;NDEBUG;No_Exception;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__"
+ PreprocessorDefinitions="NDEBUG;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__"
/>
<Tool
Name="VCPreLinkEventTool"
AdditionalOptions="-MP -favor:blend"
AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
Optimization="0"
- PreprocessorDefinitions="WIN64;DEB;_DEBUG;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__"
+ PreprocessorDefinitions="_DEBUG;CSFDB;$(CSF_DEFINES)__TKDEFS__"
ExceptionHandling="2"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
<Tool
Name="VCResourceCompilerTool"
AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
- PreprocessorDefinitions="WIN64;DEB;_DEBUG;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__"
+ PreprocessorDefinitions="_DEBUG;CSFDB;$(CSF_DEFINES)__TKDEFS__"
/>
<Tool
Name="VCPreLinkEventTool"
#include <Standard_Boolean.hxx>
#ifndef __AppBlend_API
-# if defined(WNT) && !defined(HAVE_NO_DLL)
+# if defined(_WIN32) && !defined(HAVE_NO_DLL)
# ifdef __AppBlend_DLL
# define __AppBlend_API __declspec( dllexport )
# else
# endif /*__AppBlend_DLL*/
# else
# define __AppBlend_API
-# endif /*WNT*/
+# endif /*_WIN32*/
#endif /*__AppBlend_API*/
//****************************************************
#include <Standard_Real.hxx>
//#ifndef __AppCont_API
-//#if defined(WNT) && !defined(HAVE_NO_DLL)
+//#if defined(_WIN32) && !defined(HAVE_NO_DLL)
//# ifdef __AppCont_DLL
//# define __AppCont_API __declspec( dllexport )
//# else
//# endif /* __AppCont_DLL */
//# else
//# define __AppCont_API
-//# endif /* WNT */
+//# endif /* _WIN32 */
//#endif /* __AppCont_API */
// Add this line:
#include <algorithm>
-#if defined(WNT)
+#if defined(_MSC_VER)
# include <stdio.h>
# include <stdarg.h>
-#endif /* WNT */
+#endif /* _MSC_VER */
//
//=======================================================================
#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 */
#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 */
} XColor;
-# endif /* WNT */
+# endif /* _WIN32 */
#endif /* __Aspect_WNTXWD_HXX */
#include <BOPDS_PassKey.hxx>
#include <stdio.h>
-#ifdef WNT
+#ifdef _MSC_VER
#pragma warning( disable : 4101)
#endif
#include <Standard_Type.hxx>
#include <algorithm>
-#ifdef WNT
+#ifdef _MSC_VER
#pragma warning ( disable : 4291 )
#endif
#include <TopTools_MapOfShape.hxx>
#include <stdio.h>
-//Patch
-//#ifdef WNT
-//#endif
static void Propagate(const TopTools_IndexedDataMapOfShapeListOfShape&,
const TopoDS_Shape&, // edge
TopTools_MapOfShape&); // mapofedge
return aArea / 2.;
}
-#ifdef DEB
+#ifdef OCCT_DEBUG
//=======================================================================
//function : BRepMesh_DumpPoly
//purpose :
TCollection_AsciiString& theLibName)
{
theLibName = "";
- #ifndef WNT
+ #ifndef _WIN32
theLibName += "lib";
#endif
theLibName += theDefaultName;
- #ifdef WNT
+ #ifdef _WIN32
theLibName += ".dll";
#elif __APPLE__
theLibName += ".dylib";
nbV = mapS.Extent();
-//#ifndef WNT
Standard_SStream sss;
sss << "\n## Tolerances on the shape " << a[1] << " (nbFaces:" << nbF
<< " nbEdges:" << nbE << " nbVtx:" << nbV << ")\n" ;
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;
}
#include <TopOpeBRepDS_Transition.hxx>
#include <stdio.h>
-#ifdef WNT
+#ifdef _WIN32
Standard_IMPORT Draw_Viewer dout;
#endif
#include <TColStd_MapIteratorOfPackedMapOfInteger.hxx>
-//#ifdef WNT
+//#ifdef _MSC_VER
#include <stdio.h>
//#endif
#include <Geom_Plane.hxx>
#include <gp_Pln.hxx>
-#ifdef WNT
+#ifdef _WIN32
Standard_IMPORT Draw_Viewer dout;
#endif
#include <DBRep.hxx>
#include <TopoDS.hxx>
-#ifdef WNT
+#ifdef _WIN32
Standard_IMPORT Draw_Viewer dout;
#endif
#include <TopExp_Explorer.hxx>
#include <BRepTest.hxx>
#include <TopoDS.hxx>
-//#ifdef WNT
#include <stdio.h>
-//#endif
+
static Standard_Integer prj(Draw_Interpretor& di, Standard_Integer n, const char** a)
{
char newname[255];
static BRepOffsetAPI_MakePipeShell* Sweep= 0;
-//#ifdef WNT
#include <stdio.h>
#include <Geom_Curve.hxx>
#include <GeomAdaptor_HCurve.hxx>
#include <BRepBuilderAPI_MakeFace.hxx>
#include <BRep_Tool.hxx>
#include <gp_Pnt.hxx>
-//#endi#include <gp_Vec.hxx>
#include <gp_Vec.hxx>
#include <Geom_Circle.hxx>
#include <gp_Ax2.hxx>
#ifdef MacOS
#define strcasecmp(p,q) strcmp(p,q)
-#elseif WNT
+#elseif _WIN32
#define strcasecmp strcmp
#elseif AIX
#include <string.h>
#include <TopoDS_Edge.hxx>
#include <TopoDS_Face.hxx>
-#ifdef WNT
+#ifdef _MSC_VER
#include <stdio.h>
#endif
#include <Standard_Boolean.hxx>
#ifndef __Blend_API
-# if defined(WNT) && !defined(HAVE_NO_DLL)
+# if defined(_WIN32) && !defined(HAVE_NO_DLL)
# ifdef __Blend_DLL
# define __Blend_API __declspec( dllexport )
# else
# endif /*__Blend_DLL*/
# else
# define __Blend_API
-# endif /*WNT*/
+# endif /*_WIN32*/
#endif /*__Blend_API*/
//*************************************************
#include <TColStd_ListIteratorOfListOfInteger.hxx>
#include <stdio.h>
-//#if defined(WNT) || defined(LIN)
-//#endif // WNT
//-- ================================================================================
//-- lbr le 27 fev 97
//--
#include <TCollection_ExtendedString.hxx>
#include <UTL.hxx>
-#ifdef WNT
+#ifdef _MSC_VER
#include <tchar.h>
-#endif // WNT
+#endif // _MSC_VER
//==============================================================================
//purpose :
//==============================================================================
static void PutSlash (TCollection_ExtendedString& anXSTRING) {
-#ifdef WNT
+#ifdef _WIN32
anXSTRING+="\\";
#else
anXSTRING+="/";
-#endif // WNT
+#endif // _WIN32
}
//==============================================================================
TCollection_ExtendedString theDefaultFolder;
if (theDefaultFolder.Length() == 0) {
-#ifdef WNT
+#ifdef _WIN32
TCollection_ExtendedString hd=UTL::xgetenv("HOMEDRIVE");
if(hd.Length() != NULL) {
theDefaultFolder=hd;
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++)
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++)
// 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) == '\\')
// PlotEdge or PlotIso
static TopoDS_Shape pickshape;
static Standard_Real upick,vpick;
-#ifdef WNT
+#ifdef _WIN32
extern Draw_Viewer dout;
#endif
#include <TCollection_HAsciiString.hxx>
#include <OSD_File.hxx>
-#ifdef WNT
+#ifdef _MSC_VER
#include <stdio.h>
#endif
};
-#ifdef WNT
+#ifdef _MSC_VER
#pragma warning (default : 4275)
#endif
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);
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);
#include <DDataStd_DrawPresentation.hxx>
#include <DDataStd_DrawDriver.hxx>
-#ifndef WNT
+#ifndef _WIN32
extern Draw_Viewer dout;
#else
Standard_IMPORT Draw_Viewer dout;
#include <TDF_RelocationTable.hxx>
#include <TDF_Tool.hxx>
-#ifndef WNT
+#ifndef _WIN32
extern Draw_Viewer dout;
#else
Standard_IMPORT Draw_Viewer dout;
#include <gp_Trsf.hxx>
#include <TColStd_HArray1OfInteger.hxx>
-//#ifdef WNT
+//#ifdef _MSC_VER
#include <stdio.h>
//#endif
#include <DNaming_SphereDriver.hxx>
#include <DNaming_PointDriver.hxx>
#include <DNaming_Line3DDriver.hxx>
-#ifdef WNT
+#ifdef _WIN32
#define EXCEPTION ...
#else
#define EXCEPTION Standard_Failure
#include <TopTools_MapIteratorOfMapOfShape.hxx>
#include <TopTools_MapOfShape.hxx>
-#ifdef WNT
+#ifdef _WIN32
#define EXCEPTION ...
#else
#define EXCEPTION Standard_Failure
//#include <AppStdL_Application.hxx>
// avoid warnings on 'extern "C"' functions returning C++ classes
-#ifdef WNT
+#ifdef _MSC_VER
#pragma warning(4:4190)
#endif
//static Handle(AppStdL_Application) stdApp;
commercial license or contractual agreement.
*/
-#ifdef WNT
+#ifdef _WIN32
#define COMMANDCLASS "COMMANDWINDOW"
// Alternatively, this file may be used under the terms of Open CASCADE
// commercial license or contractual agreement.
-#ifdef WNT
+#ifdef _WIN32
#include <windows.h>
#define COMMANDCLASS "COMMANDWINDOW"
// *******************************************************************
// read an init file
// *******************************************************************
-#ifdef WNT
+#ifdef _WIN32
extern console_semaphore_value volatile console_semaphore;
extern char console_command[1000];
#endif
static void ReadInitFile (const TCollection_AsciiString& theFileName)
{
TCollection_AsciiString aPath = theFileName;
-#ifdef WNT
+#ifdef _WIN32
if (!Draw_Batch) {
try {
aPath.ChangeAll ('\\', '/');
Sprintf (com, "source %s", aPath.ToCString());
Draw_Interprete (com);
delete [] com;
-#ifdef WNT
+#ifdef _WIN32
}
#endif
}
return PInd;
}
-#ifndef WNT
+#ifndef _WIN32
/*--------------------------------------------------------*\
| exitProc: finalization handler for Tcl/Tk thread. Forces parent process to die
\*--------------------------------------------------------*/
// *****************************************************************
// 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();
// *****************************************************************
Draw_InitAppli(theCommands);
-#ifndef WNT
+#ifndef _WIN32
Tcl_CreateExitHandler(exitProc, 0);
#endif
{
if (getenv ("CASROOT") == NULL)
{
-#ifdef WNT
+#ifdef _WIN32
ReadInitFile ("ddefault");
#else
cout << " the CASROOT variable is mandatory to Run OpenCascade "<< endl;
ReadInitFile (aRunFile);
// provide a clean exit, this is useful for some analysis tools
if ( ! isInteractiveForced )
-#ifndef WNT
+#ifndef _WIN32
return;
#else
ExitProcess(0);
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);
// X loop
// *****************************************************************
if (XLoop) {
-#ifdef WNT
+#ifdef _WIN32
Run_Appli(hWnd);
#else
Run_Appli(Draw_Interprete);
cmd[i] = '\0';
} while (Draw_Interprete(cmd) != (unsigned int ) -2);
}
-#ifdef WNT
+#ifdef _WIN32
// Destruction de l'application
Destroy_Appli(hInst);
#endif
}
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";
commercial license or contractual agreement.
*/
-#ifdef WNT
+#ifdef _MSC_VER
//{{NO_DEPENDENCIES}}
// Microsoft Developer Studio generated include file.
typedef void (*FDraw_InitAppli)(Draw_Interpretor&);
-#ifdef WNT
+#ifdef _WIN32
#include <windows.h>
//extern void Draw_Appli(HINSTANCE,HINSTANCE,LPSTR,int);
Standard_EXPORT void Draw_Appli(HINSTANCE,HINSTANCE,LPSTR,int,
-#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 )
#endif
-#ifndef WNT
+#ifndef _WIN32
extern Draw_Viewer dout;
extern Standard_Boolean Draw_Batch;
#endif
static Standard_Real MinimumStep = 1.e-3 ;
static Standard_Real Ratio = 200.0 ;
-//#ifdef WNT
extern Draw_Viewer dout;
-//#endif
//=======================================================================
// Function : Draw_Grid
cout << "An exception was caught " << E << endl;
if (cc && Draw::Atoi(cc)) {
-#ifdef WNT
+#ifdef _WIN32
Tcl_Exit(0);
#else
Tcl_Eval(interp,"exit");
#endif
}
#else
-#ifdef WNT
+#ifdef _WIN32
Tcl_Exit(0);
#endif
#endif
#include <tcl.h>
-#ifdef WNT
+#ifdef _WIN32
#include <sys/stat.h>
#include <Draw_Window.hxx>
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
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);
#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);}
}
}
-#ifdef WNT
+#ifdef _WIN32
//=======================================================================
//function : MakeView
//purpose :
}
-#ifdef WNT
+#ifdef _WIN32
//=======================================================================
//function : ResizeView
//purpose : WNT re-drawing optimization
#include <Draw_SequenceOfDrawable3D.hxx>
#include <Draw_Color.hxx>
-#ifdef WNT
+#ifdef _WIN32
#include <windows.h>
#if !defined(__Draw_API) && !defined(HAVE_NO_DLL)
# ifdef __Draw_DLL
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,
__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
// commercial license or contractual agreement.
// include windows.h first to have all definitions available
-#ifdef WNT
+#ifdef _WIN32
#include <windows.h>
#endif
/** MainWindow.h
*/
/*\****************************************************/
-#ifdef WNT
+#ifdef _WIN32
#define CLIENTWND 0
// Alternatively, this file may be used under the terms of Open CASCADE
// commercial license or contractual agreement.
-#ifdef WNT
+#ifdef _WIN32
#include <windows.h>
#include <DrawRessource.h>
// Alternatively, this file may be used under the terms of Open CASCADE
// commercial license or contractual agreement.
-#ifdef WNT
+#ifdef _WIN32
// include windows.h first to have all definitions available
#include <windows.h>
commercial license or contractual agreement.
*/
-#ifdef WNT
+#ifdef _WIN32
#define APPCLASS "TDRAW"
#define APPTITLE "Windows NT TDRAW"
#include <TopoDS_Shape.hxx>
#include <TopoDS_Vertex.hxx>
-#ifdef WNT
+#ifdef _WIN32
Standard_IMPORT Draw_Viewer dout;
#endif
#include <gp_Ax3.hxx>
#include <gp_Pln.hxx>
#include <DrawTrSurf.hxx>
-#ifdef WNT
+#ifdef _MSC_VER
#include <stdio.h>
#endif
//=======================================================================
#include <TColStd_Array1OfInteger.hxx>
#include <stdio.h>
-//#ifdef WNT
-//#endif
//=======================================================================
//function : DrawTrSurf_Triangulation
//purpose :
#include <TColgp_Array1OfPnt2d.hxx>
#include <TColStd_Array1OfInteger.hxx>
-#ifdef WNT
+#ifdef _MSC_VER
#include <stdio.h>
#endif
#include <TCollection_ExtendedString.hxx>
#include <stdio.h>
-//pop pour NT
-//#if WNT
-//#endif
//=======================================================================
//function : Add
//purpose :
#include <Expr_Division.hxx>
#ifndef __Expr_API
-# if defined(WNT) && !defined(HAVE_NO_DLL)
+# if defined(_WIN32) && !defined(HAVE_NO_DLL)
# ifdef __Expr_DLL
# define __Expr_API __declspec( dllexport )
# else
# 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);
#include <ExprIntrp_Analysis.hxx>
#ifndef _ExprIntrp_API
-# if !defined(WNT) || defined(__ExprIntrp_DLL) || defined(__Expr_DLL) || defined(__ExprIntrp_DLL) || defined(__math_DLL) || defined(__MathBase_DLL) || defined(__ElCLib_DLL) || defined(__ElSLib_DLL) || defined(__BSplCLib_DLL) || defined(__BSplSLib_DLL) || defined(__Smoothing_DLL) || defined(__SysBase_DLL) || defined(__Data_DLL) || defined(__PLib_DLL) || defined(__GeomAbs_DLL) || defined(__Poly_DLL) || defined(__CSLib_DLL) || defined(__Convert_DLL) || defined(__Bnd_DLL) || defined(__gp_DLL) || defined(__TColgp_DLL)
+# if !defined(_WIN32) || defined(__ExprIntrp_DLL) || defined(__Expr_DLL) || defined(__ExprIntrp_DLL) || defined(__math_DLL) || defined(__MathBase_DLL) || defined(__ElCLib_DLL) || defined(__ElSLib_DLL) || defined(__BSplCLib_DLL) || defined(__BSplSLib_DLL) || defined(__Smoothing_DLL) || defined(__SysBase_DLL) || defined(__Data_DLL) || defined(__PLib_DLL) || defined(__GeomAbs_DLL) || defined(__Poly_DLL) || defined(__CSLib_DLL) || defined(__Convert_DLL) || defined(__Bnd_DLL) || defined(__gp_DLL) || defined(__TColgp_DLL)
# define __ExprIntrp_API Standard_EXPORT
# define __ExprIntrp_APIEXTERN Standard_EXPORTEXTERN
# else
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()
#include <stdio.h>
-#ifdef WNT
+#ifdef _MSC_VER
# include <stdlib.h>
# include <io.h>
-#endif /* WNT */
+#endif /* _MSC_VER */
}
}
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);
#include <GeomAbs_Shape.hxx>
#include <stdio.h>
-#ifdef WNT
+#ifdef _WIN32
Standard_IMPORT Draw_Viewer dout;
#endif
#include <TColStd_Array2OfReal.hxx>
#include <Precision.hxx>
#include <stdio.h>
-#ifdef WNT
+#ifdef _WIN32
Standard_IMPORT Draw_Viewer dout;
#endif
#include <GC_MakeSegment.hxx>
#include <GC_MakeArcOfCircle.hxx>
-//#ifdef WNT
#include <stdio.h>
-#ifdef WNT
+#ifdef _WIN32
Standard_IMPORT Draw_Viewer dout;
#endif
Standard_IMPORT Draw_Color DrawTrSurf_CurveColor(const Draw_Color);
#include <GCPnts_UniformAbscissa.hxx>
#include <DBRep.hxx>
-#ifdef WNT
+#ifdef _WIN32
Standard_IMPORT Draw_Viewer dout;
#endif
#include <TColgp_Array1OfPnt.hxx>
#include <TColgp_Array1OfPnt2d.hxx>
-#ifdef WNT
+#ifdef _WIN32
Standard_IMPORT Draw_Viewer dout;
#endif
//=======================================================================
#include <DrawTrSurf_BezierSurface.hxx>
#include <DrawTrSurf_BSplineSurface.hxx>
-#ifdef WNT
+#ifdef _MSC_VER
#include <stdio.h>
//#define strcasecmp strcmp Already defined
+#endif
+
+#ifdef _WIN32
Standard_IMPORT Draw_Viewer dout;
#endif
#include <Draw_Marker3D.hxx>
#include <stdio.h>
-#ifdef WNT
+#ifdef _WIN32
Standard_IMPORT Draw_Viewer dout;
#endif
#include <IntRes2d_IntersectionPoint.hxx>
#include <stdio.h>
-#ifdef WNT
+#ifdef _WIN32
Standard_IMPORT Draw_Viewer dout;
#endif
#include <AppDef_Array1OfMultiPointConstraint.hxx>
#include <math_Vector.hxx>
-#ifdef WNT
+#ifdef _MSC_VER
#include <stdio.h>
+#endif
+
+#ifdef _WIN32
Standard_IMPORT Draw_Viewer dout;
#endif
#include <Approx_CurvilinearParameter.hxx>
#include <Approx_CurveOnSurface.hxx>
#include <Geom_BSplineSurface.hxx>
-#ifdef WNT
+#ifdef _WIN32
Standard_IMPORT Draw_Viewer dout;
#endif
#include <Geom_BoundedCurve.hxx>
#include <Geom_BoundedSurface.hxx>
-#ifdef WNT
+#ifdef _MSC_VER
#include <stdio.h>
//#define strcasecmp strcmp Already defined
#endif
#include <DBRep.hxx>
#include <Geom_Curve.hxx>
-//#ifdef WNT
#include <stdio.h>
#ifdef _WIN32
-//#define strcasecmp strcmp Already defined
Standard_IMPORT Draw_Viewer dout;
#endif
#include <TopoDS_Shape.hxx>
static Handle(HLRBRep_Algo) hider;
-#ifdef WNT
+#ifdef _WIN32
Standard_IMPORT Draw_Viewer dout;
#endif
#include <stdio.h>
//#include <ShapeCustom.hxx>
-#ifdef WNT
+#ifdef _MSC_VER
#include <stdlib.h>
#else
#include <errno.h>
#include <gp_Vec.hxx>
#include <IntImp_ConstIsoparametric.hxx>
-#if !defined(WNT) || defined(__ApproxInt_DLL) || defined(__IntImp_DLL) || defined(__IntWalk_DLL) || defined(__GeomInt_DLL) || defined(__IntPatch_DLL)
+#if !defined(_WIN32) || defined(__ApproxInt_DLL) || defined(__IntImp_DLL) || defined(__IntWalk_DLL) || defined(__GeomInt_DLL) || defined(__IntPatch_DLL)
Standard_EXPORTEXTERN const IntImp_ConstIsoparametric *ChoixRef;
#else
Standard_IMPORT const IntImp_ConstIsoparametric *ChoixRef;
return 1;
}
-#ifdef WNT
+#ifdef _MSC_VER
#pragma warning ( default : 4101 )
#endif
}
-#ifdef WNT
+#ifdef _MSC_VER
#pragma warning ( default : 4101 )
#endif
#include <Standard_Transient.hxx>
#include <TCollection_HAsciiString.hxx>
-#ifdef WNT
+#ifdef _WIN32
#include <OSD_Exception.hxx>
#else
#include <OSD_Signal.hxx>
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)))
#include <Standard_Transient.hxx>
#include <Standard_TypeMismatch.hxx>
-#ifdef WNT
+#ifdef _WIN32
#include <OSD_Exception.hxx>
#else
#include <OSD_Signal.hxx>
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;
}
#ifdef OCCT_DEBUG
-#ifndef WNT
+#ifndef _MSC_VER
//=======================================================================
// Debug Function for DBX: use "print -p <Variable> or pp <Variable>"
//=======================================================================
#include <TCollection_ExtendedString.hxx>
#include <fcntl.h>
-#ifdef WNT
+#ifdef _MSC_VER
#include <io.h>
#else
#include <unistd.h>
#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";
}
#ifdef OCCT_DEBUG
-#ifndef WNT
+#ifndef _MSC_VER
//=======================================================================
// Debug Function for DBX: use "print -p <Variable> or pp <Variable>"
//=======================================================================
#include <string.h>
#include <errno.h>
-#ifdef WNT
+#ifdef _MSC_VER
#include <io.h>
#else
#include <unistd.h>
break;
}
default:
-#ifndef WNT
+#ifndef _MSC_VER
cerr << "Unrecognized node type = "
<< (long)theNodeToWrite.getNodeType() << endl
#endif
//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
#include <stdio.h>
//epa Memory leaks test
//OAN: for triepoints
-#ifdef WNT
+#ifdef _WIN32
Standard_IMPORT Draw_Viewer dout;
#endif
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";
{
TCollection_AsciiString aFileName = aDirList.Token (" \t\n", i);
if (aFileName.IsEmpty()) break;
-#ifdef WNT
+#ifdef _WIN32
aFileName += '\\';
#else
aFileName += '/';
//purpose : Cause the process to sleep during a amount of seconds
//=======================================================================
-#ifdef WNT
+#ifdef _WIN32
# include <Windows.h>
#if !defined(__CYGWIN32__) && !defined(__MINGW32__)
//# include <Mapiwin.h>
# 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
#include <Standard_Stream.hxx>
// ====================== PLATFORM-SPECIFIC PART ========================
-#ifndef WNT
+#ifndef _WIN32
//---------- Systemes autres que WNT : ----------------------------------
//=======================================================================
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;
SystemSeconds = 0.0000001 * EncodeFILETIME (&ftKernel);
}
-#endif /* WNT */
+#endif /* _WIN32 */
// ====================== PLATFORM-INDEPENDENT PART ========================
// Alternatively, this file may be used under the terms of Open CASCADE
// commercial license or contractual agreement.
-#ifndef WNT
+#ifndef _WIN32
#include <OSD_Directory.hxx>
// Alternatively, this file may be used under the terms of Open CASCADE
// commercial license or contractual agreement.
-#ifndef WNT
+#ifndef _WIN32
#include <OSD_Directory.hxx>
// Alternatively, this file may be used under the terms of Open CASCADE
// commercial license or contractual agreement.
-#ifndef WNT
+#ifndef _WIN32
#include <OSD_Environment.hxx>
// Alternatively, this file may be used under the terms of Open CASCADE
// commercial license or contractual agreement.
-#ifndef WNT
+#ifndef _WIN32
#include <OSD_Error.hxx>
// Alternatively, this file may be used under the terms of Open CASCADE
// commercial license or contractual agreement.
-#ifndef WNT
+#ifndef _WIN32
#include <OSD_File.hxx>
// Alternatively, this file may be used under the terms of Open CASCADE
// commercial license or contractual agreement.
-#ifndef WNT
+#ifndef _WIN32
#include <OSD_Host.hxx>
#include <OSD_MAllocHook.hxx>
-#ifndef WNT
+#ifndef _MSC_VER
#if !defined __STDC_LIMIT_MACROS
#define __STDC_LIMIT_MACROS
#endif
// Platform-dependent methods
//!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-#ifdef WNT
+#ifdef _MSC_VER
#include <crtdbg.h>
#if _MSC_VER >= 1500 /* VS 2008 */
_CrtSetAllocHook(MyAllocHook);
}
-#else // ! WNT
+#else // ! _MSC_VER
// Not yet implemented for non-WNT platform
MypCurrentCallback = theCB;
}
-#endif // WNT
+#endif // _MSC_VER
//!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
// LogFileHandler handler methods
// Platform-dependent definition of the thread handle type
-#ifdef WNT
+#ifdef _WIN32
#include <windows.h>
typedef HANDLE OSD_PThread;
#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)
// Alternatively, this file may be used under the terms of Open CASCADE
// commercial license or contractual agreement.
-#ifndef WNT
+#ifndef _WIN32
#include <OSD_OSDError.hxx>
// Alternatively, this file may be used under the terms of Open CASCADE
// commercial license or contractual agreement.
-#ifndef WNT
+#ifndef _WIN32
#include <OSD_Environment.hxx>
// Alternatively, this file may be used under the terms of Open CASCADE
// commercial license or contractual agreement.
-#ifndef WNT
+#ifndef _WIN32
#include <OSD_Directory.hxx>
// Alternatively, this file may be used under the terms of Open CASCADE
// commercial license or contractual agreement.
-#ifndef WNT
+#ifndef _WIN32
#include <OSD_Function.hxx>
myFunc = other.myFunc;
myPriority = other.myPriority;
-#ifdef WNT
+#ifdef _WIN32
// On Windows, close current handle
if ( myThread )
void OSD_Thread::Destroy ()
{
-#ifdef WNT
+#ifdef _WIN32
// On Windows, close current handle
if ( myThread )
void OSD_Thread::SetPriority (const Standard_Integer thePriority)
{
myPriority = thePriority;
-#ifdef WNT
+#ifdef _WIN32
if (myThread)
SetThreadPriority (myThread, thePriority);
#endif
// OSD_Thread::Run
//=============================================
-#ifdef WNT
+#ifdef _WIN32
#include <malloc.h>
// On Windows the signature of the thread function differs from that on UNIX/Linux.
// As we use the same definition of the thread function on all platforms (POSIX-like),
#endif
Standard_Boolean OSD_Thread::Run (const Standard_Address data,
-#ifdef WNT
+#ifdef _WIN32
const Standard_Integer WNTStackSize
#else
const Standard_Integer
myThreadId = 0;
-#ifdef WNT
+#ifdef _WIN32
// On Windows, close current handle if open
if ( myThread )
void OSD_Thread::Detach ()
{
-#ifdef WNT
+#ifdef _WIN32
// On Windows, close current handle
if ( myThread )
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 )
if ( ! myThread )
return Standard_False;
-#ifdef WNT
+#ifdef _WIN32
// On Windows, wait for the thread handle to be signaled
DWORD ret = WaitForSingleObject ( myThread, time );
Standard_ThreadId OSD_Thread::Current ()
{
-#ifdef WNT
+#ifdef _WIN32
return GetCurrentThreadId();
#else
return pthread_self();
// that the thread function returns just integer (casted to void*).
// This shall work on all platforms.
-//#ifdef WNT
+//#ifdef _WIN32
//#include <windows.h>
//typedef LPTHREAD_START_ROUTINE OSD_ThreadFunction;
//#else
#include <OSD_Timer.hxx>
-#ifndef WNT
+#ifndef _WIN32
//---------- No Windows NT Systems ----------------------------------
0.001 * GetTickCount();
}
-#endif /* WNT */
+#endif /* _WIN32 */
// ====================== PLATFORM-INDEPENDENT PART ========================
// 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 */
#ifndef __OSD_WNT_BREAK_HXX
# define __OSD_WNT_BREAK_HXX
-# ifdef WNT
+# ifdef _WIN32
# include <OSD.hxx>
# define _TSTBRK() OSD :: ControlBreak ()
-# endif // WNT
+# endif // _WIN32
#endif // __OSD_WNT_BREAK_HXX
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
#undef __finally
#undef __leave
#endif
-#endif // WNT
+#endif // _WIN32
#ifndef __OPENGL_AVIWRITER_H
#define __OPENGL_AVIWRITER_H
-#ifdef WNT
+#ifdef _MSC_VER
#define THIS void
#include <InterfaceGraphic.hxx>
Standard_EXPORT Standard_Boolean OpenGl_AVIWriter_AllowWriting(void * hWin);
-#endif // WNT
+#endif // _MSC_VER
#endif
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
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
const TCollection_AsciiString& aRelFilePath)
{
TCollection_AsciiString EmptyString = "" ;
-#ifdef WNT
+#ifdef _WIN32
if (aRelFilePath.Search(":") == 2 ||
(aRelFilePath.Search("\\") == 1 && aRelFilePath.Value(2) == '\\'))
#else
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
#endif
return EmptyString ;
-#ifdef WNT
+#ifdef _WIN32
DirPath.ChangeAll('\\','/') ;
RelFilePath.ChangeAll('\\','/') ;
#endif
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("\\");
#include <Storage_Data.hxx>
#include <UTL.hxx>
-#ifdef WNT
+#ifdef _MSC_VER
# include <tchar.h>
-#endif // WNT
+#endif // _MSC_VER
//=======================================================================
//function : PCDM_ReferenceIterator
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);
}
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));
}
}
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";
#include <Poly_CoherentNode.hxx>
#include <Poly_CoherentTriangle.hxx>
-#ifdef WNT
+#ifdef _MSC_VER
#pragma warning(disable:4996)
#endif
class Poly_CoherentTriangle;
-#ifdef WNT
+#ifdef _MSC_VER
#pragma warning (push)
#pragma warning(disable:4355) //'this' : used in base member initializer list
#endif
friend class Iterator;
};
-#ifdef WNT
+#ifdef _MSC_VER
#pragma warning (pop)
#endif
#include <Draw_Viewer.hxx>
#include <Draw.hxx>
-#ifndef WNT
+#ifndef _WIN32
extern Draw_Viewer dout;
#else
Standard_IMPORT Draw_Viewer dout;
#include <BRepBuilderAPI_MakeFace.hxx>
#include <TopoDS.hxx>
-#if ! defined(WNT)
+#if ! defined(_WIN32)
extern ViewerTest_DoubleMapOfInteractiveAndName& GetMapOfAIS();
#else
Standard_EXPORT ViewerTest_DoubleMapOfInteractiveAndName& GetMapOfAIS();
#include <TDocStd_Document.hxx>
#include <Standard_ErrorHandler.hxx>
-#if ! defined(WNT)
+#if ! defined(_WIN32)
extern ViewerTest_DoubleMapOfInteractiveAndName& GetMapOfAIS();
#else
Standard_EXPORT ViewerTest_DoubleMapOfInteractiveAndName& GetMapOfAIS();
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);
#include <OSD.hxx>
#include <ShapeFix_Wire.hxx>
#include <ShapeExtend_Status.hxx>
-#ifdef WNT
+#ifdef _WIN32
#define EXCEPTION ...
#else
#define EXCEPTION Standard_Failure
#include<BRepAdaptor_HSurface.hxx>
#include<TopOpeBRep_PointClassifier.hxx>
#include<Precision.hxx>
-#ifdef WNT
+#ifdef _MSC_VER
#include<stdio.h>
#endif
#include <SelectMgr_Selection.hxx>
#include <StdSelect_BRepOwner.hxx>
#include <SelectBasics_SensitiveEntity.hxx>
-#if ! defined(WNT)
+#if ! defined(_WIN32)
extern ViewerTest_DoubleMapOfInteractiveAndName& GetMapOfAIS();
#else
Standard_EXPORT ViewerTest_DoubleMapOfInteractiveAndName& GetMapOfAIS();
#include <gp_Trsf.hxx>
#include <TColStd_HArray1OfInteger.hxx>
-//#ifdef WNT
+//#ifdef _MSC_VER
#include <stdio.h>
//#endif
#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
# endif // __Quantity_DLL
# else
# define __Quantity_API
-# endif // WNT
+# endif // _WIN32
#endif // __Quantity_API
{
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 );
#include <Standard_Mutex.hxx>
#include <Standard.hxx>
-#ifndef WNT
+#ifndef _WIN32
#include <pthread.h>
#else
#include <windows.h>
static inline Standard_ThreadId GetThreadID()
{
-#ifndef WNT
+#ifndef _WIN32
return pthread_self();
#else
return GetCurrentThreadId();
#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
myNbPages = 1000;
// get system-dependent page size
-#ifndef WNT
+#ifndef _WIN32
myPageSize = getpagesize();
if ( ! myPageSize )
myMMap = 0;
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;
// 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 =
// 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);
// 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
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);
#include <Standard_MMgrTBBalloc.hxx>
#include <Standard_OutOfMemory.hxx>
-// NOTE: replaced by more correct check
-//#if defined(WNT) || defined(LIN)
-//#define HAVE_TBB 1
-//#endif
-
// paralleling with Intel TBB
#ifdef HAVE_TBB
#include <tbb/scalable_allocator.h>
// 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
#define NOIME NOIME
#endif
-# else /* WNT */
+# else /* UNIX */
//======================================================
// UNIX definitions
#define _MEMORY_H
#endif
-# endif /* WNT */
+# endif /* _WIN32 */
//======================================================
// Other
//======================================================
# ifndef __Standard_API
-//# ifdef WNT
# if !defined(_WIN32) || defined(__Standard_DLL) || defined(__FSD_DLL) || defined(__MMgt_DLL) || defined(__OSD_DLL) || defined(__Plugin_DLL) || defined(__Quantity_DLL) || defined(__Resource_DLL) || defined(__SortTools_DLL) || defined(__StdFail_DLL) || defined(__Storage_DLL) || defined(__TColStd_DLL) || defined(__TCollection_DLL) || defined(__TShort_DLL) || defined(__Units_DLL) || defined(__UnitsAPI_DLL) || defined(__Dico_DLL)
# define __Standard_API Standard_EXPORT
# define __Standard_APIEXTERN Standard_EXPORTEXTERN
# define __Standard_API Standard_IMPORT
# define __Standard_APIEXTERN Standard_IMPORT
# endif // __Standard_DLL
-//# else
-//# define __Standard_API
-//# endif // WNT
# endif // __Standard_API
#endif
// Platform-dependent definition of the thread identifier type
-#ifdef WNT
+#ifdef _WIN32
#include <windows.h>
typedef DWORD Standard_ThreadId;
#include <Standard_Type.hxx>
-#ifdef WNT
+#ifdef _WIN32
#include <windows.h>
#else
typedef struct {
#ifndef _Standard_values_HeaderFile
# define _Standard_values_HeaderFile
-#if defined(_MSC_VER) && !defined(WNT)
-#error "Wrong compiler options has been detected. Add /DWNT option for proper compilation!!!!!"
-#endif
-
#ifdef _WIN32
# include <limits>
#else
#include <stdio.h>
-#ifdef WNT
+#ifdef _MSC_VER
# include <stdlib.h>
# include <io.h>
-#endif /* WNT */
+#endif /* _MSC_VER */
*/
/* ABV 19.12.00: merging porting modifications by POP (for WNT, AIX) */
-#if defined(WNT) && !defined(MSDOS)
-#define MSDOS WNT
+#if defined(_WIN32) && !defined(MSDOS)
+#define MSDOS _WIN32
#endif
#if defined(_AIX)
#include <malloc.h>
//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) ); }
//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); }
#include <TDF_Label.hxx>
#include <TDF_RelocationTable.hxx>
-#ifdef WNT
+#ifdef _WIN32
#define EXCEPTION ...
#else
#define EXCEPTION Standard_Failure
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("/"));
else
return;
}
-#endif //WNT
+#endif //_WIN32
if(isTrek) {
temp.Trunc(PointPosition-1);
myTrek = temp;
} else
-#ifdef WNT
+#ifdef _WIN32
myTrek = ".\\";
#else
myTrek = "./";
{
char buf[256];
if(strlen(filename) > 256) return;
-#if defined WNT
+#if defined _MSC_VER
strcpy_s (buf, filename);
#else
strcpy (buf, filename);
{
char buf[256];
if(strlen(filename) > 255) return;
-#ifdef WNT
+#ifdef _MSC_VER
strcpy_s (buf, filename);
#else
strcpy (buf, filename);
{
char buf[256];
if(strlen(filename) > 255) return;
-#if defined WNT
+#if defined _MSC_VER
strcpy_s (buf, filename);
#else
strcpy (buf, filename);
#include <Message_Msg.hxx>
#include <OSD_OpenFile.hxx>
-#ifdef WNT
+#ifdef _MSC_VER
#include <io.h>
#else
#include <unistd.h>
#include <stdio.h>
// avoid warnings on 'extern "C"' functions returning C++ classes
-#ifdef WNT
+#ifdef _MSC_VER
#pragma warning(4:4190)
#endif
#include <TopOpeBRepDS_Dumper.hxx>
#include <TopOpeBRepDS_HDataStructure.hxx>
-#ifdef WNT
+#ifdef _MSC_VER
#pragma warning(4:4190)
#endif
#include <gp_Pnt.hxx>
#include <DBRep.hxx>
#include <Draw_Appli.hxx>
-#ifdef WNT
+#ifdef _WIN32
Standard_IMPORT Draw_Viewer dout;
#endif
#include <TopOpeBRepBuild_HBuilder.hxx>
#include <TopOpeBRepDS_HDataStructure.hxx>
-#ifdef WNT
+#ifdef _WIN32
Standard_IMPORT Draw_Viewer dout;
#endif
#include <DBRep.hxx>
#include <DBRep_DrawableShape.hxx>
-#ifdef WNT
+#ifdef _WIN32
Standard_IMPORT Draw_Viewer dout;
#endif
//purpose :
//=======================================================================
-#ifdef WNT
+#ifdef _MSC_VER
#pragma warning(push)
#pragma warning(disable: 4291) // to avoid warning when using new(buffer) syntax
#endif
hasMore = Standard_False;
}
-#ifdef WNT
+#ifdef _MSC_VER
#pragma warning(pop)
#endif
#include <TopOpeBRep.hxx>
-//#ifdef WNT
+//#ifdef _WIN32
//#define strcasecmp strcmp Already defined
//#endif
//=======================================================================
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
#include <sys/stat.h>
#include <sys/types.h>
-#ifdef WNT
+#ifdef _MSC_VER
# include <stdio.h>
#else
#include <Standard_Stream.hxx>
-#endif // WNT
+#endif // _MSC_VER
//=======================================================================
//function : Units_Lexicon
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
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());
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());
/* Includes */
/************************************************************************/
-#ifdef WNT
+#ifdef _WIN32
#include <windows.h>
#pragma comment( lib, "comdlg32.lib" )
#endif
#include <V3d_View.hxx>
#include <V3d_Viewer.hxx>
-#ifdef WNT
+#ifdef _WIN32
struct Device
{
Device();
const Standard_CString theFilename,
const Aspect_PrintAlgo thePrintAlgorithm) const
{
-#ifdef WNT
+#ifdef _WIN32
if (myView->IsDefined())
{
if (thePrintDC != NULL)
#include <Draw_PluginMacro.hxx>
// avoid warnings on 'extern "C"' functions returning C++ classes
-#ifdef WNT
+#ifdef _MSC_VER
#define _CRT_SECURE_NO_DEPRECATE
#pragma warning(4:4190)
#pragma warning (disable:4996)
#include <Prs3d_LineAspect.hxx>
#include <Prs3d_Root.hxx>
-#ifdef WNT
+#ifdef _WIN32
#undef DrawText
#endif
//==============================================================================
-#ifdef WNT
+#ifdef _WIN32
static LRESULT WINAPI ViewerWindowProc(
HWND hwnd,
UINT uMsg,
return 0;
}
-#ifdef WNT
+#ifdef _WIN32
static Standard_Boolean Ppick = 0;
static Standard_Integer Pargc = 0;
XSynchronize(aDisplay, 0);
#else
- // WNT
+ // _WIN32
#endif
}
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
#include <Standard_ErrorHandler.hxx>
#include <VrmlData_ArrayVec3d.hxx>
-#ifdef WNT
+#ifdef _MSC_VER
#define _CRT_SECURE_NO_DEPRECATE
#pragma warning (disable:4996)
#endif
#include <Precision.hxx>
#include <gp_Ax1.hxx>
-#ifdef WNT
+#ifdef _MSC_VER
#define _CRT_SECURE_NO_DEPRECATE
#pragma warning (disable:4996)
#endif
#include <Poly.hxx>
#include <TShort_HArray1OfShortReal.hxx>
-#ifdef WNT
+#ifdef _MSC_VER
#define _CRT_SECURE_NO_DEPRECATE
#pragma warning (disable:4996)
#endif
#include <VrmlData_Color.hxx>
#include <VrmlData_Coordinate.hxx>
-#ifdef WNT
+#ifdef _MSC_VER
#define _CRT_SECURE_NO_DEPRECATE
#pragma warning (disable:4996)
#endif
#include <VrmlData_Scene.hxx>
#include <gp_XYZ.hxx>
-#ifdef WNT
+#ifdef _MSC_VER
#define _CRT_SECURE_NO_DEPRECATE
#pragma warning (disable:4996)
#endif
#include <VrmlData_TextureTransform.hxx>
#include <VrmlData_Texture.hxx>
-#ifdef WNT
+#ifdef _MSC_VER
#define _CRT_SECURE_NO_DEPRECATE
#pragma warning (disable:4996)
#endif
#include <VrmlData_WorldInfo.hxx>
#include <VrmlData_Geometry.hxx>
-#ifdef WNT
+#ifdef _MSC_VER
#define _CRT_SECURE_NO_DEPRECATE
#pragma warning (disable:4996)
#endif
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 ("/");
#include <VrmlData_Scene.hxx>
#include <VrmlData_InBuffer.hxx>
-#ifdef WNT
+#ifdef _MSC_VER
#define _CRT_SECURE_NO_DEPRECATE
#pragma warning (disable:4996)
#endif
#include <stdio.h>
#define ZVIEW_SIZE 1000000.0
// avoid warnings on 'extern "C"' functions returning C++ classes
-#ifdef WNT
+#ifdef _MSC_VER
#pragma warning(4:4190)
#endif
#include <XSDRAWSTLVRML_DrawableMesh.hxx>
// avoid warnings on 'extern "C"' functions returning C++ classes
-#ifdef WNT
+#ifdef _MSC_VER
#pragma warning(4:4190)
#endif
#include <XmlObjMgt_Document.hxx>
#include <XmlObjMgt_RRelocationTable.hxx>
-#ifdef WNT
+#ifdef _MSC_VER
# include <tchar.h>
-#endif // WNT
+#endif // _MSC_VER
#include <locale.h>
#include <Standard_Failure.hxx>
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
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("\\");
const TCollection_AsciiString& aRelFilePath)
{
TCollection_AsciiString EmptyString = "" ;
-#ifdef WNT
+#ifdef _WIN32
if (aRelFilePath.Search(":") == 2 ||
(aRelFilePath.Search("\\") == 1 && aRelFilePath.Value(2) == '\\'))
#else
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
#endif
return EmptyString ;
-#ifdef WNT
+#ifdef _WIN32
DirPath.ChangeAll('\\','/') ;
RelFilePath.ChangeAll('\\','/') ;
#endif
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);
}
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));
////////////
#include <sys/timeb.h>
#include <sys/types.h>
#include <stdio.h>
-#ifndef WNT
+#ifndef _WIN32
extern "C" int ftime (struct timeb *tp);
#endif
extern struct timeb tmbuf0;
#include <sys/timeb.h>
#include <sys/types.h>
#include <stdio.h>
-#ifndef WNT
+#ifndef _WIN32
extern "C" int ftime (struct timeb *tp);
#endif
struct timeb tmbuf0;
IMPLEMENT_DOMSTRING (ExtString, "string")
IMPLEMENT_DOMSTRING (Value, "value")
-#ifdef WNT
+#ifdef _WIN32
#define EXCEPTION ...
#else
#define EXCEPTION Standard_Failure
#include <TColStd_Array1OfReal.hxx>
#include <stdio.h>
-//#ifdef WNT
-//#endif
#define ITMAX 100
#define EPS 1e-14
#define EPSEPS 2e-14
#include <Standard_Real.hxx>
#ifndef __math_API
-# if defined(WNT) && !defined(HAVE_NO_DLL)
+# if defined(_WIN32) && !defined(HAVE_NO_DLL)
# ifdef __math_DLL
# define __math_API __declspec( dllexport )
# else
# endif /* __math_DLL */
# else
# define __math_API
-# endif /* WNT */
+# endif /* _WIN32 */
#endif /* __math_API */
class math_IntegerVector;
projects / occt-copy.git / commitdiff