OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-05-16 10:54:53 +03:00
Code

0022972: Eliminate macro definitions that has compiler-provided analogs (WNT and so on)

Browse Source 
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.
This commit is contained in:
akz 2015-09-15 17:46:43 +03:00 committed by kgv
parent 28a73c1fe7
commit 57c28b6122
180 changed files with 370 additions and 411 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
adm/CMPLRS
View File

@ -1,18 +1,18 @@
wnt WOKSteps_exec_link DRAWEXE #WOKStep_EXELink(exec.tks) wnt WOKSteps_exec_link DRAWEXE #WOKStep_EXELink(exec.tks)
lin 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 f -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 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 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 f -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 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 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 f -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 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 f -D_GNU_SOURCE=1 -fexceptions
lin cmplrs_c b -DLIN -DLININTEL -D_GNU_SOURCE=1 -fexceptions lin cmplrs_c b -D_GNU_SOURCE=1 -fexceptions

39
adm/cmake/occt_defs_flags.cmake
View File

@ -13,11 +13,11 @@ endif()
add_definitions (-DCSFDB) add_definitions (-DCSFDB)
if (WIN32) if (WIN32)
add_definitions (/DWNT -wd4996) add_definitions (-wd4996)
elseif (APPLE) elseif (APPLE)
add_definitions (-fexceptions -fPIC -DOCC_CONVERT_SIGNALS -DHAVE_WOK_CONFIG_H -DHAVE_CONFIG_H) add_definitions (-fexceptions -fPIC -DOCC_CONVERT_SIGNALS)
else() else()
add_definitions (-fexceptions -fPIC -DOCC_CONVERT_SIGNALS -DHAVE_WOK_CONFIG_H -DHAVE_CONFIG_H -DLIN) add_definitions (-fexceptions -fPIC -DOCC_CONVERT_SIGNALS)
endif() endif()
# enable structured exceptions for MSVC # enable structured exceptions for MSVC
@ -28,6 +28,34 @@ elseif (WIN32)
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -EHa") set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -EHa")
endif() 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 # remove DEBUG flag if it exists
string (REGEX MATCH "-DDEBUG" IS_DEBUG_CXX "${CMAKE_CXX_FLAGS_DEBUG}") string (REGEX MATCH "-DDEBUG" IS_DEBUG_CXX "${CMAKE_CXX_FLAGS_DEBUG}")
if (IS_DEBUG_CXX) if (IS_DEBUG_CXX)
@ -64,7 +92,4 @@ if (DEFINED CMAKE_COMPILER_IS_GNUCXX OR "x${CMAKE_CXX_COMPILER_ID}" STREQUAL "xC
endif() endif()
set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -DNo_Exception") set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -DNo_Exception")
set (CMAKE_C_FLAGS_RELEASE "${CMAKE_C_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")

8
adm/genproj.tcl
View File

@ -2007,12 +2007,8 @@ proc osutils:cbpx { theOutDir theToolKit } {
# extra macros # extra macros
lappend aTKDefines "CSFDB" lappend aTKDefines "CSFDB"
if { "$aWokStation" == "wnt" } { if { "$aWokStation" == "wnt" } {
lappend aTKDefines "WNT"
lappend aTKDefines "_CRT_SECURE_NO_DEPRECATE" lappend aTKDefines "_CRT_SECURE_NO_DEPRECATE"
} else { } else {
if { "$aWokStation" == "lin" } {
lappend aTKDefines "LIN"
}
lappend aTKDefines "OCC_CONVERT_SIGNALS" lappend aTKDefines "OCC_CONVERT_SIGNALS"
#lappend aTKDefines "_GNU_SOURCE=1" #lappend aTKDefines "_GNU_SOURCE=1"
} }
@ -2283,12 +2279,8 @@ proc osutils:tkinfo { theRelativePath theToolKit theUsedLib theFrameworks theInc
# extra macros # extra macros
lappend aTKDefines "CSFDB" lappend aTKDefines "CSFDB"
if { "$aWokStation" == "wnt" } { if { "$aWokStation" == "wnt" } {
lappend aTKDefines "WNT"
lappend aTKDefines "_CRT_SECURE_NO_DEPRECATE" lappend aTKDefines "_CRT_SECURE_NO_DEPRECATE"
} else { } else {
if { "$aWokStation" == "lin" } {
lappend aTKDefines "LIN"
}
lappend aTKDefines "OCC_CONVERT_SIGNALS" lappend aTKDefines "OCC_CONVERT_SIGNALS"
#lappend aTKDefines "_GNU_SOURCE=1" #lappend aTKDefines "_GNU_SOURCE=1"
} }

16
adm/templates/template.vc10
View File

@ -85,7 +85,7 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<Optimization>MaxSpeed</Optimization> <Optimization>MaxSpeed</Optimization>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> <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> <StringPooling>true</StringPooling>
<ExceptionHandling>Async</ExceptionHandling> <ExceptionHandling>Async</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@ -100,7 +100,7 @@
</ClCompile> </ClCompile>
<ResourceCompile> <ResourceCompile>
<AdditionalIncludeDirectories>..\..\..\inc;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <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> </ResourceCompile>
<Link> <Link>
<AdditionalDependencies>__TKDEP__;ws2_32.lib;vfw32.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>__TKDEP__;ws2_32.lib;vfw32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -128,7 +128,7 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<Optimization>Disabled</Optimization> <Optimization>Disabled</Optimization>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> <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> <ExceptionHandling>Async</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<AssemblerListingLocation>.\..\..\..\win32\__VCVER__\objd\__TKNAM__/</AssemblerListingLocation> <AssemblerListingLocation>.\..\..\..\win32\__VCVER__\objd\__TKNAM__/</AssemblerListingLocation>
@ -144,7 +144,7 @@
</ClCompile> </ClCompile>
<ResourceCompile> <ResourceCompile>
<AdditionalIncludeDirectories>..\..\..\inc;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <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> </ResourceCompile>
<Link> <Link>
<AdditionalDependencies>__TKDEP__;ws2_32.lib;vfw32.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>__TKDEP__;ws2_32.lib;vfw32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -173,7 +173,7 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<Optimization>MaxSpeed</Optimization> <Optimization>MaxSpeed</Optimization>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> <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> <StringPooling>true</StringPooling>
<ExceptionHandling>Async</ExceptionHandling> <ExceptionHandling>Async</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@ -188,7 +188,7 @@
</ClCompile> </ClCompile>
<ResourceCompile> <ResourceCompile>
<AdditionalIncludeDirectories>..\..\..\inc;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <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> </ResourceCompile>
<Link> <Link>
<AdditionalDependencies>__TKDEP__;ws2_32.lib;vfw32.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>__TKDEP__;ws2_32.lib;vfw32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -216,7 +216,7 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<Optimization>Disabled</Optimization> <Optimization>Disabled</Optimization>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> <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> <ExceptionHandling>Async</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<AssemblerListingLocation>.\..\..\..\win64\__VCVER__\objd\__TKNAM__/</AssemblerListingLocation> <AssemblerListingLocation>.\..\..\..\win64\__VCVER__\objd\__TKNAM__/</AssemblerListingLocation>
@ -232,7 +232,7 @@
</ClCompile> </ClCompile>
<ResourceCompile> <ResourceCompile>
<AdditionalIncludeDirectories>..\..\..\inc;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <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> </ResourceCompile>
<Link> <Link>
<AdditionalDependencies>__TKDEP__;ws2_32.lib;vfw32.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>__TKDEP__;ws2_32.lib;vfw32.lib;%(AdditionalDependencies)</AdditionalDependencies>

16
adm/templates/template.vc10x
View File

@ -85,7 +85,7 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<Optimization>MaxSpeed</Optimization> <Optimization>MaxSpeed</Optimization>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> <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> <StringPooling>true</StringPooling>
<ExceptionHandling>Async</ExceptionHandling> <ExceptionHandling>Async</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@ -100,7 +100,7 @@
</ClCompile> </ClCompile>
<ResourceCompile> <ResourceCompile>
<AdditionalIncludeDirectories>..\..\..\inc;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <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> </ResourceCompile>
<Link> <Link>
<AdditionalDependencies>__TKDEP__;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>__TKDEP__;%(AdditionalDependencies)</AdditionalDependencies>
@ -127,7 +127,7 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<Optimization>Disabled</Optimization> <Optimization>Disabled</Optimization>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> <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> <ExceptionHandling>Async</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<AssemblerListingLocation>.\..\..\..\win32\__VCVER__\objd\__XQTNAM__/</AssemblerListingLocation> <AssemblerListingLocation>.\..\..\..\win32\__VCVER__\objd\__XQTNAM__/</AssemblerListingLocation>
@ -143,7 +143,7 @@
</ClCompile> </ClCompile>
<ResourceCompile> <ResourceCompile>
<AdditionalIncludeDirectories>..\..\..\inc;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <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> </ResourceCompile>
<Link> <Link>
<AdditionalDependencies>__TKDEP__;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>__TKDEP__;%(AdditionalDependencies)</AdditionalDependencies>
@ -171,7 +171,7 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<Optimization>MaxSpeed</Optimization> <Optimization>MaxSpeed</Optimization>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> <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> <StringPooling>true</StringPooling>
<ExceptionHandling>Async</ExceptionHandling> <ExceptionHandling>Async</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@ -186,7 +186,7 @@
</ClCompile> </ClCompile>
<ResourceCompile> <ResourceCompile>
<AdditionalIncludeDirectories>..\..\..\inc;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <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> </ResourceCompile>
<Link> <Link>
<AdditionalDependencies>__TKDEP__;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>__TKDEP__;%(AdditionalDependencies)</AdditionalDependencies>
@ -213,7 +213,7 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<Optimization>Disabled</Optimization> <Optimization>Disabled</Optimization>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> <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> <ExceptionHandling>Async</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<AssemblerListingLocation>.\..\..\..\win64\__VCVER__\objd\__XQTNAM__/</AssemblerListingLocation> <AssemblerListingLocation>.\..\..\..\win64\__VCVER__\objd\__XQTNAM__/</AssemblerListingLocation>
@ -229,7 +229,7 @@
</ClCompile> </ClCompile>
<ResourceCompile> <ResourceCompile>
<AdditionalIncludeDirectories>..\..\..\inc;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <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> </ResourceCompile>
<Link> <Link>
<AdditionalDependencies>__TKDEP__;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>__TKDEP__;%(AdditionalDependencies)</AdditionalDependencies>

10
adm/templates/template.vc7
View File

@ -22,7 +22,7 @@
AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)" AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
Optimization="2" Optimization="2"
InlineFunctionExpansion="1" InlineFunctionExpansion="1"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;WNT;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__" PreprocessorDefinitions="NDEBUG;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__"
StringPooling="TRUE" StringPooling="TRUE"
RuntimeLibrary="2" RuntimeLibrary="2"
EnableFunctionLevelLinking="TRUE" EnableFunctionLevelLinking="TRUE"
@ -62,7 +62,7 @@
<Tool <Tool
Name="VCResourceCompilerTool" Name="VCResourceCompilerTool"
AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)" 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"/> Culture="1036"/>
<Tool <Tool
Name="VCWebServiceProxyGeneratorTool"/> Name="VCWebServiceProxyGeneratorTool"/>
@ -89,8 +89,8 @@
AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)" AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
Optimization="0" Optimization="0"
InlineFunctionExpansion="1" InlineFunctionExpansion="1"
PreprocessorDefinitions="DEB;_DEBUG;WIN32;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__" PreprocessorDefinitions="_DEBUG;CSFDB;$(CSF_DEFINES)__TKDEFS__"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
RuntimeLibrary="3" RuntimeLibrary="3"
PrecompiledHeaderFile=".\..\..\..\win32\vc7\objd\__TKNAM__\__TKNAM__.pch" PrecompiledHeaderFile=".\..\..\..\win32\vc7\objd\__TKNAM__\__TKNAM__.pch"
AssemblerListingLocation=".\..\..\..\win32\vc7\objd\__TKNAM__/" AssemblerListingLocation=".\..\..\..\win32\vc7\objd\__TKNAM__/"
@ -131,7 +131,7 @@
<Tool <Tool
Name="VCResourceCompilerTool" Name="VCResourceCompilerTool"
AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)" AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
PreprocessorDefinitions="DEB;_DEBUG;WIN32;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__" PreprocessorDefinitions="_DEBUG;CSFDB;$(CSF_DEFINES)__TKDEFS__"
Culture="1036"/> Culture="1036"/>
<Tool <Tool
Name="VCWebServiceProxyGeneratorTool"/> Name="VCWebServiceProxyGeneratorTool"/>

8
adm/templates/template.vc7x
View File

@ -22,7 +22,7 @@
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)" AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
Optimization="0" Optimization="0"
PreprocessorDefinitions="WIN32;DEB;_DEBUG;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__" PreprocessorDefinitions="_DEBUG;CSFDB;$(CSF_DEFINES)__TKDEFS__"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
RuntimeLibrary="3" RuntimeLibrary="3"
AssemblerListingLocation=".\..\..\..\win32\vc7\objd\__XQTNAM__/" AssemblerListingLocation=".\..\..\..\win32\vc7\objd\__XQTNAM__/"
@ -61,7 +61,7 @@
<Tool <Tool
Name="VCResourceCompilerTool" Name="VCResourceCompilerTool"
AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)" AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
PreprocessorDefinitions="WIN32;DEB;_DEBUG;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__" PreprocessorDefinitions="_DEBUG;CSFDB;$(CSF_DEFINES)__TKDEFS__"
Culture="1033"/> Culture="1033"/>
<Tool <Tool
Name="VCWebServiceProxyGeneratorTool"/> Name="VCWebServiceProxyGeneratorTool"/>
@ -86,7 +86,7 @@
AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)" AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
Optimization="2" Optimization="2"
InlineFunctionExpansion="1" InlineFunctionExpansion="1"
PreprocessorDefinitions="WIN32;NDEBUG;No_Exception;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__" PreprocessorDefinitions="NDEBUG;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__"
StringPooling="TRUE" StringPooling="TRUE"
RuntimeLibrary="2" RuntimeLibrary="2"
EnableFunctionLevelLinking="TRUE" EnableFunctionLevelLinking="TRUE"
@ -124,7 +124,7 @@
<Tool <Tool
Name="VCResourceCompilerTool" Name="VCResourceCompilerTool"
AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)" 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"/> Culture="1033"/>
<Tool <Tool
Name="VCWebServiceProxyGeneratorTool"/> Name="VCWebServiceProxyGeneratorTool"/>

16
adm/templates/template.vc8
View File

@ -50,7 +50,7 @@
AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)" AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
Optimization="2" Optimization="2"
InlineFunctionExpansion="1" InlineFunctionExpansion="1"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;WNT;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__" PreprocessorDefinitions="NDEBUG;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__"
StringPooling="true" StringPooling="true"
ExceptionHandling="2" ExceptionHandling="2"
RuntimeLibrary="2" RuntimeLibrary="2"
@ -71,7 +71,7 @@
<Tool <Tool
Name="VCResourceCompilerTool" Name="VCResourceCompilerTool"
AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)" 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" Culture="1036"
/> />
<Tool <Tool
@ -149,7 +149,7 @@
AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)" AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
Optimization="0" Optimization="0"
InlineFunctionExpansion="1" InlineFunctionExpansion="1"
PreprocessorDefinitions="DEB;_DEBUG;WIN32;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__" PreprocessorDefinitions="_DEBUG;CSFDB;$(CSF_DEFINES)__TKDEFS__"
ExceptionHandling="2" ExceptionHandling="2"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
RuntimeLibrary="3" RuntimeLibrary="3"
@ -172,7 +172,7 @@
<Tool <Tool
Name="VCResourceCompilerTool" Name="VCResourceCompilerTool"
AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)" AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
PreprocessorDefinitions="DEB;_DEBUG;WIN32;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__" PreprocessorDefinitions="_DEBUG;CSFDB;$(CSF_DEFINES)__TKDEFS__"
Culture="1036" Culture="1036"
/> />
<Tool <Tool
@ -251,7 +251,7 @@
AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)" AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
Optimization="2" Optimization="2"
InlineFunctionExpansion="1" InlineFunctionExpansion="1"
PreprocessorDefinitions="NDEBUG;WIN64;_WINDOWS;WNT;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__" PreprocessorDefinitions="NDEBUG;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__"
StringPooling="true" StringPooling="true"
ExceptionHandling="2" ExceptionHandling="2"
RuntimeLibrary="2" RuntimeLibrary="2"
@ -271,7 +271,7 @@
<Tool <Tool
Name="VCResourceCompilerTool" Name="VCResourceCompilerTool"
AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)" 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" Culture="1036"
/> />
<Tool <Tool
@ -350,7 +350,7 @@
AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)" AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
Optimization="0" Optimization="0"
InlineFunctionExpansion="1" InlineFunctionExpansion="1"
PreprocessorDefinitions="DEB;_DEBUG;WIN64;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__" PreprocessorDefinitions="_DEBUG;CSFDB;$(CSF_DEFINES)__TKDEFS__"
ExceptionHandling="2" ExceptionHandling="2"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
RuntimeLibrary="3" RuntimeLibrary="3"
@ -372,7 +372,7 @@
<Tool <Tool
Name="VCResourceCompilerTool" Name="VCResourceCompilerTool"
AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)" AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
PreprocessorDefinitions="DEB;_DEBUG;WIN64;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__" PreprocessorDefinitions="_DEBUG;CSFDB;$(CSF_DEFINES)__TKDEFS__"
Culture="1036" Culture="1036"
/> />
<Tool <Tool

16
adm/templates/template.vc8x
View File

@ -49,7 +49,7 @@
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)" AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
Optimization="0" Optimization="0"
PreprocessorDefinitions="WIN32;DEB;_DEBUG;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__;" PreprocessorDefinitions="_DEBUG;CSFDB;$(CSF_DEFINES)__TKDEFS__;"
ExceptionHandling="2" ExceptionHandling="2"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
RuntimeLibrary="3" RuntimeLibrary="3"
@ -69,7 +69,7 @@
<Tool <Tool
Name="VCResourceCompilerTool" Name="VCResourceCompilerTool"
AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)" AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
PreprocessorDefinitions="WIN32;DEB;_DEBUG;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__;" PreprocessorDefinitions="_DEBUG;CSFDB;$(CSF_DEFINES)__TKDEFS__;"
Culture="1033" Culture="1033"
/> />
<Tool <Tool
@ -146,7 +146,7 @@
AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)" AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
Optimization="2" Optimization="2"
InlineFunctionExpansion="1" InlineFunctionExpansion="1"
PreprocessorDefinitions="WIN32;NDEBUG;No_Exception;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__;" PreprocessorDefinitions="NDEBUG;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__;"
StringPooling="true" StringPooling="true"
ExceptionHandling="2" ExceptionHandling="2"
RuntimeLibrary="2" RuntimeLibrary="2"
@ -166,7 +166,7 @@
<Tool <Tool
Name="VCResourceCompilerTool" Name="VCResourceCompilerTool"
AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)" 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" Culture="1033"
/> />
<Tool <Tool
@ -242,7 +242,7 @@
AdditionalOptions="/favor:blend" AdditionalOptions="/favor:blend"
AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)" AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
Optimization="0" Optimization="0"
PreprocessorDefinitions="WIN64;DEB;_DEBUG;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__" PreprocessorDefinitions="_DEBUG;CSFDB;$(CSF_DEFINES)__TKDEFS__"
ExceptionHandling="2" ExceptionHandling="2"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
RuntimeLibrary="3" RuntimeLibrary="3"
@ -261,7 +261,7 @@
<Tool <Tool
Name="VCResourceCompilerTool" Name="VCResourceCompilerTool"
AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)" AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
PreprocessorDefinitions="WIN64;DEB;_DEBUG;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__" PreprocessorDefinitions="_DEBUG;CSFDB;$(CSF_DEFINES)__TKDEFS__"
Culture="1033" Culture="1033"
/> />
<Tool <Tool
@ -340,7 +340,7 @@
AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)" AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
Optimization="2" Optimization="2"
InlineFunctionExpansion="1" InlineFunctionExpansion="1"
PreprocessorDefinitions="WIN64;NDEBUG;No_Exception;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__" PreprocessorDefinitions="NDEBUG;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__"
StringPooling="true" StringPooling="true"
ExceptionHandling="2" ExceptionHandling="2"
RuntimeLibrary="2" RuntimeLibrary="2"
@ -359,7 +359,7 @@
<Tool <Tool
Name="VCResourceCompilerTool" Name="VCResourceCompilerTool"
AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)" 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" Culture="1033"
/> />
<Tool <Tool

16
adm/templates/template.vc9
View File

@ -52,7 +52,7 @@
AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)" AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
Optimization="2" Optimization="2"
InlineFunctionExpansion="1" InlineFunctionExpansion="1"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;WNT;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__" PreprocessorDefinitions="NDEBUG;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__"
StringPooling="true" StringPooling="true"
ExceptionHandling="2" ExceptionHandling="2"
RuntimeLibrary="2" RuntimeLibrary="2"
@ -73,7 +73,7 @@
<Tool <Tool
Name="VCResourceCompilerTool" Name="VCResourceCompilerTool"
AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)" 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 <Tool
Name="VCPreLinkEventTool" Name="VCPreLinkEventTool"
@ -150,7 +150,7 @@
AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)" AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
Optimization="0" Optimization="0"
InlineFunctionExpansion="1" InlineFunctionExpansion="1"
PreprocessorDefinitions="DEB;_DEBUG;WIN32;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__" PreprocessorDefinitions="_DEBUG;CSFDB;$(CSF_DEFINES)__TKDEFS__"
ExceptionHandling="2" ExceptionHandling="2"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
RuntimeLibrary="3" RuntimeLibrary="3"
@ -173,7 +173,7 @@
<Tool <Tool
Name="VCResourceCompilerTool" Name="VCResourceCompilerTool"
AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)" AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
PreprocessorDefinitions="DEB;_DEBUG;WIN32;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__" PreprocessorDefinitions="_DEBUG;CSFDB;$(CSF_DEFINES)__TKDEFS__"
/> />
<Tool <Tool
Name="VCPreLinkEventTool" Name="VCPreLinkEventTool"
@ -248,7 +248,7 @@
AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)" AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
Optimization="2" Optimization="2"
InlineFunctionExpansion="1" InlineFunctionExpansion="1"
PreprocessorDefinitions="NDEBUG;WIN64;_WINDOWS;WNT;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__" PreprocessorDefinitions="NDEBUG;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__"
StringPooling="true" StringPooling="true"
ExceptionHandling="2" ExceptionHandling="2"
RuntimeLibrary="2" RuntimeLibrary="2"
@ -268,7 +268,7 @@
<Tool <Tool
Name="VCResourceCompilerTool" Name="VCResourceCompilerTool"
AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)" 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 <Tool
Name="VCPreLinkEventTool" Name="VCPreLinkEventTool"
@ -343,7 +343,7 @@
AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)" AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
Optimization="0" Optimization="0"
InlineFunctionExpansion="1" InlineFunctionExpansion="1"
PreprocessorDefinitions="DEB;_DEBUG;WIN64;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__" PreprocessorDefinitions="_DEBUG;CSFDB;$(CSF_DEFINES)__TKDEFS__"
ExceptionHandling="2" ExceptionHandling="2"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
RuntimeLibrary="3" RuntimeLibrary="3"
@ -365,7 +365,7 @@
<Tool <Tool
Name="VCResourceCompilerTool" Name="VCResourceCompilerTool"
AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)" AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
PreprocessorDefinitions="DEB;_DEBUG;WIN64;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__" PreprocessorDefinitions="_DEBUG;CSFDB;$(CSF_DEFINES)__TKDEFS__"
/> />
<Tool <Tool
Name="VCPreLinkEventTool" Name="VCPreLinkEventTool"

16
adm/templates/template.vc9x
View File

@ -52,7 +52,7 @@
AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)" AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
Optimization="2" Optimization="2"
InlineFunctionExpansion="1" InlineFunctionExpansion="1"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;WNT;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__" PreprocessorDefinitions="NDEBUG;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__"
StringPooling="true" StringPooling="true"
ExceptionHandling="2" ExceptionHandling="2"
RuntimeLibrary="2" RuntimeLibrary="2"
@ -72,7 +72,7 @@
<Tool <Tool
Name="VCResourceCompilerTool" Name="VCResourceCompilerTool"
AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)" 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 <Tool
Name="VCPreLinkEventTool" Name="VCPreLinkEventTool"
@ -144,7 +144,7 @@
AdditionalOptions="-MP" AdditionalOptions="-MP"
AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)" AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
Optimization="0" Optimization="0"
PreprocessorDefinitions="DEB;_DEBUG;WIN32;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__" PreprocessorDefinitions="_DEBUG;CSFDB;$(CSF_DEFINES)__TKDEFS__"
ExceptionHandling="2" ExceptionHandling="2"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
RuntimeLibrary="3" RuntimeLibrary="3"
@ -164,7 +164,7 @@
<Tool <Tool
Name="VCResourceCompilerTool" Name="VCResourceCompilerTool"
AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)" AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
PreprocessorDefinitions="DEB;_DEBUG;WIN32;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__" PreprocessorDefinitions="_DEBUG;CSFDB;$(CSF_DEFINES)__TKDEFS__"
/> />
<Tool <Tool
Name="VCPreLinkEventTool" Name="VCPreLinkEventTool"
@ -238,7 +238,7 @@
AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)" AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
Optimization="2" Optimization="2"
InlineFunctionExpansion="1" InlineFunctionExpansion="1"
PreprocessorDefinitions="WIN64;NDEBUG;No_Exception;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__" PreprocessorDefinitions="NDEBUG;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__"
StringPooling="true" StringPooling="true"
ExceptionHandling="2" ExceptionHandling="2"
RuntimeLibrary="2" RuntimeLibrary="2"
@ -257,7 +257,7 @@
<Tool <Tool
Name="VCResourceCompilerTool" Name="VCResourceCompilerTool"
AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)" 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 <Tool
Name="VCPreLinkEventTool" Name="VCPreLinkEventTool"
@ -330,7 +330,7 @@
AdditionalOptions="-MP -favor:blend" AdditionalOptions="-MP -favor:blend"
AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)" AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
Optimization="0" Optimization="0"
PreprocessorDefinitions="WIN64;DEB;_DEBUG;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__" PreprocessorDefinitions="_DEBUG;CSFDB;$(CSF_DEFINES)__TKDEFS__"
ExceptionHandling="2" ExceptionHandling="2"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
RuntimeLibrary="3" RuntimeLibrary="3"
@ -349,7 +349,7 @@
<Tool <Tool
Name="VCResourceCompilerTool" Name="VCResourceCompilerTool"
AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)" AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
PreprocessorDefinitions="WIN64;DEB;_DEBUG;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__" PreprocessorDefinitions="_DEBUG;CSFDB;$(CSF_DEFINES)__TKDEFS__"
/> />
<Tool <Tool
Name="VCPreLinkEventTool" Name="VCPreLinkEventTool"

4
src/AppBlend/AppBlend_Debug.cxx
View File

@ -17,7 +17,7 @@
#include <Standard_Boolean.hxx> #include <Standard_Boolean.hxx>
#ifndef __AppBlend_API #ifndef __AppBlend_API
# if defined(WNT) && !defined(HAVE_NO_DLL) # if defined(_WIN32) && !defined(HAVE_NO_DLL)
# ifdef __AppBlend_DLL # ifdef __AppBlend_DLL
# define __AppBlend_API __declspec( dllexport ) # define __AppBlend_API __declspec( dllexport )
# else # else
@ -25,7 +25,7 @@
# endif /*__AppBlend_DLL*/ # endif /*__AppBlend_DLL*/
# else # else
# define __AppBlend_API # define __AppBlend_API
# endif /*WNT*/ # endif /*_WIN32*/
#endif /*__AppBlend_API*/ #endif /*__AppBlend_API*/
//**************************************************** //****************************************************

4
src/AppCont/AppCont_ContMatrices.hxx
View File

@ -18,7 +18,7 @@
#include <Standard_Real.hxx> #include <Standard_Real.hxx>
//#ifndef __AppCont_API //#ifndef __AppCont_API
//#if defined(WNT) && !defined(HAVE_NO_DLL) //#if defined(_WIN32) && !defined(HAVE_NO_DLL)
//# ifdef __AppCont_DLL //# ifdef __AppCont_DLL
//# define __AppCont_API __declspec( dllexport ) //# define __AppCont_API __declspec( dllexport )
//# else //# else
@ -26,7 +26,7 @@
//# endif /* __AppCont_DLL */ //# endif /* __AppCont_DLL */
//# else //# else
//# define __AppCont_API //# define __AppCont_API
//# endif /* WNT */ //# endif /* _WIN32 */
//#endif /* __AppCont_API */ //#endif /* __AppCont_API */

4
src/AppDef/AppDef_Variational.cxx
View File

@ -82,10 +82,10 @@
// Add this line: // Add this line:
#include <algorithm> #include <algorithm>
#if defined(WNT) #if defined(_MSC_VER)
# include <stdio.h> # include <stdio.h>
# include <stdarg.h> # include <stdarg.h>
#endif /* WNT */ #endif /* _MSC_VER */
// //
//======================================================================= //=======================================================================

4
src/Aspect/Aspect_Drawable.hxx
View File

@ -22,10 +22,10 @@
#ifndef _Aspect_Drawable_HeaderFile #ifndef _Aspect_Drawable_HeaderFile
#define _Aspect_Drawable_HeaderFile #define _Aspect_Drawable_HeaderFile
#ifdef WNT #ifdef _WIN32
typedef void* Aspect_Drawable; /* HDC under WNT */ typedef void* Aspect_Drawable; /* HDC under WNT */
#else #else
typedef unsigned long Aspect_Drawable; /* Window or Pixmap under UNIX */ typedef unsigned long Aspect_Drawable; /* Window or Pixmap under UNIX */
#endif /* WNT */ #endif /* _WIN32 */
#endif /* _Aspect_Drawable_HeaderFile */ #endif /* _Aspect_Drawable_HeaderFile */

4
src/Aspect/Aspect_Handle.hxx
View File

@ -21,11 +21,11 @@
#ifndef _Aspect_Handle_HeaderFile #ifndef _Aspect_Handle_HeaderFile
#define _Aspect_Handle_HeaderFile #define _Aspect_Handle_HeaderFile
#ifdef WNT #ifdef _WIN32
typedef void* HANDLE; typedef void* HANDLE;
typedef HANDLE Aspect_Handle; typedef HANDLE Aspect_Handle;
#else #else
typedef unsigned long Aspect_Handle; typedef unsigned long Aspect_Handle;
#endif /* WNT */ #endif /* _WIN32 */
#endif /* _Aspect_Handle_HeaderFile */ #endif /* _Aspect_Handle_HeaderFile */

2
src/Aspect/Aspect_XWD.hxx
View File

@ -89,5 +89,5 @@ typedef struct _xcolor {
} XColor; } XColor;
# endif /* WNT */ # endif /* _WIN32 */
#endif /* __Aspect_WNTXWD_HXX */ #endif /* __Aspect_WNTXWD_HXX */

2
src/BOPDS/BOPDS_PassKey.cxx
View File

@ -19,7 +19,7 @@
#include <BOPDS_PassKey.hxx> #include <BOPDS_PassKey.hxx>
#include <stdio.h> #include <stdio.h>
#ifdef WNT #ifdef _MSC_VER
#pragma warning( disable : 4101) #pragma warning( disable : 4101)
#endif #endif

2
src/BOPDS/BOPDS_PaveBlock.cxx
View File

@ -23,7 +23,7 @@
#include <Standard_Type.hxx> #include <Standard_Type.hxx>
#include <algorithm> #include <algorithm>
#ifdef WNT #ifdef _MSC_VER
#pragma warning ( disable : 4291 ) #pragma warning ( disable : 4291 )
#endif #endif

3
src/BRepCheck/BRepCheck_Wire.cxx
View File

@ -74,9 +74,6 @@
#include <TopTools_MapOfShape.hxx> #include <TopTools_MapOfShape.hxx>
#include <stdio.h> #include <stdio.h>
//Patch
//#ifdef WNT
//#endif
static void Propagate(const TopTools_IndexedDataMapOfShapeListOfShape&, static void Propagate(const TopTools_IndexedDataMapOfShapeListOfShape&,
const TopoDS_Shape&, // edge const TopoDS_Shape&, // edge
TopTools_MapOfShape&); // mapofedge TopTools_MapOfShape&); // mapofedge

2
src/BRepMesh/BRepMesh_Delaun.cxx
View File

@ -2350,7 +2350,7 @@ Standard_Real BRepMesh_Delaun::polyArea(const BRepMesh::SequenceOfInteger& thePo
return aArea / 2.; return aArea / 2.;
} }
#ifdef DEB #ifdef OCCT_DEBUG
//======================================================================= //=======================================================================
//function : BRepMesh_DumpPoly //function : BRepMesh_DumpPoly
//purpose : //purpose :

4
src/BRepMesh/BRepMesh_DiscretFactory.cxx
View File

@ -31,11 +31,11 @@ namespace
TCollection_AsciiString& theLibName) TCollection_AsciiString& theLibName)
{ {
theLibName = ""; theLibName = "";
#ifndef WNT #ifndef _WIN32
theLibName += "lib"; theLibName += "lib";
#endif #endif
theLibName += theDefaultName; theLibName += theDefaultName;
#ifdef WNT #ifdef _WIN32
theLibName += ".dll"; theLibName += ".dll";
#elif __APPLE__ #elif __APPLE__
theLibName += ".dylib"; theLibName += ".dylib";

3
src/BRepTest/BRepTest_BasicCommands.cxx
View File

@ -620,7 +620,6 @@ static Standard_Integer maxtolerance(Draw_Interpretor& theCommands,
nbV = mapS.Extent(); nbV = mapS.Extent();
//#ifndef WNT
Standard_SStream sss; Standard_SStream sss;
sss << "\n## Tolerances on the shape " << a[1] << " (nbFaces:" << nbF sss << "\n## Tolerances on the shape " << a[1] << " (nbFaces:" << nbF
<< " nbEdges:" << nbE << " nbVtx:" << nbV << ")\n" ; << " 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(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 "; if(TmV<=TMV) sss << "\n Vertex : Min " << setw(8) << TmV <<" Max " << setw(8) << TMV << " \n ";
theCommands << sss; theCommands << sss;
//#endif*/
return 0; return 0;
} }

2
src/BRepTest/BRepTest_CurveCommands.cxx
View File

@ -69,7 +69,7 @@
#include <TopOpeBRepDS_Transition.hxx> #include <TopOpeBRepDS_Transition.hxx>
#include <stdio.h> #include <stdio.h>
#ifdef WNT #ifdef _WIN32
Standard_IMPORT Draw_Viewer dout; Standard_IMPORT Draw_Viewer dout;
#endif #endif

2
src/BRepTest/BRepTest_ExtremaCommands.cxx
View File

@ -33,7 +33,7 @@
#include <TColStd_MapIteratorOfPackedMapOfInteger.hxx> #include <TColStd_MapIteratorOfPackedMapOfInteger.hxx>
//#ifdef WNT //#ifdef _MSC_VER
#include <stdio.h> #include <stdio.h>
//#endif //#endif

2
src/BRepTest/BRepTest_GPropCommands.cxx
View File

@ -33,7 +33,7 @@
#include <Geom_Plane.hxx> #include <Geom_Plane.hxx>
#include <gp_Pln.hxx> #include <gp_Pln.hxx>
#ifdef WNT #ifdef _WIN32
Standard_IMPORT Draw_Viewer dout; Standard_IMPORT Draw_Viewer dout;
#endif #endif

2
src/BRepTest/BRepTest_MatCommands.cxx
View File

@ -50,7 +50,7 @@
#include <DBRep.hxx> #include <DBRep.hxx>
#include <TopoDS.hxx> #include <TopoDS.hxx>
#ifdef WNT #ifdef _WIN32
Standard_IMPORT Draw_Viewer dout; Standard_IMPORT Draw_Viewer dout;
#endif #endif

3
src/BRepTest/BRepTest_ProjectionCommands.cxx
View File

@ -24,9 +24,8 @@
#include <TopExp_Explorer.hxx> #include <TopExp_Explorer.hxx>
#include <BRepTest.hxx> #include <BRepTest.hxx>
#include <TopoDS.hxx> #include <TopoDS.hxx>
//#ifdef WNT
#include <stdio.h> #include <stdio.h>
//#endif
static Standard_Integer prj(Draw_Interpretor& di, Standard_Integer n, const char** a) static Standard_Integer prj(Draw_Interpretor& di, Standard_Integer n, const char** a)
{ {
char newname[255]; char newname[255];

2
src/BRepTest/BRepTest_SweepCommands.cxx
View File

@ -44,7 +44,6 @@
static BRepOffsetAPI_MakePipeShell* Sweep= 0; static BRepOffsetAPI_MakePipeShell* Sweep= 0;
//#ifdef WNT
#include <stdio.h> #include <stdio.h>
#include <Geom_Curve.hxx> #include <Geom_Curve.hxx>
#include <GeomAdaptor_HCurve.hxx> #include <GeomAdaptor_HCurve.hxx>
@ -53,7 +52,6 @@ static BRepOffsetAPI_MakePipeShell* Sweep= 0;
#include <BRepBuilderAPI_MakeFace.hxx> #include <BRepBuilderAPI_MakeFace.hxx>
#include <BRep_Tool.hxx> #include <BRep_Tool.hxx>
#include <gp_Pnt.hxx> #include <gp_Pnt.hxx>
//#endi#include <gp_Vec.hxx>
#include <gp_Vec.hxx> #include <gp_Vec.hxx>
#include <Geom_Circle.hxx> #include <Geom_Circle.hxx>
#include <gp_Ax2.hxx> #include <gp_Ax2.hxx>

2
src/BRepTools/BRepTools_ShapeSet.cxx
View File

@ -58,7 +58,7 @@
#ifdef MacOS #ifdef MacOS
#define strcasecmp(p,q) strcmp(p,q) #define strcasecmp(p,q) strcmp(p,q)
#elseif WNT #elseif _WIN32
#define strcasecmp strcmp #define strcasecmp strcmp
#elseif AIX #elseif AIX
#include <string.h> #include <string.h>

2
src/BRepTopAdaptor/BRepTopAdaptor_FClass2d.cxx
View File

@ -42,7 +42,7 @@
#include <TopoDS_Edge.hxx> #include <TopoDS_Edge.hxx>
#include <TopoDS_Face.hxx> #include <TopoDS_Face.hxx>
#ifdef WNT #ifdef _MSC_VER
#include <stdio.h> #include <stdio.h>
#endif #endif

4
src/Blend/Blend_Debug.cxx
View File

@ -17,7 +17,7 @@
#include <Standard_Boolean.hxx> #include <Standard_Boolean.hxx>
#ifndef __Blend_API #ifndef __Blend_API
# if defined(WNT) && !defined(HAVE_NO_DLL) # if defined(_WIN32) && !defined(HAVE_NO_DLL)
# ifdef __Blend_DLL # ifdef __Blend_DLL
# define __Blend_API __declspec( dllexport ) # define __Blend_API __declspec( dllexport )
# else # else
@ -25,7 +25,7 @@
# endif /*__Blend_DLL*/ # endif /*__Blend_DLL*/
# else # else
# define __Blend_API # define __Blend_API
# endif /*WNT*/ # endif /*_WIN32*/
#endif /*__Blend_API*/ #endif /*__Blend_API*/
//************************************************* //*************************************************

2
src/Bnd/Bnd_BoundSortBox.cxx
View File

@ -25,8 +25,6 @@
#include <TColStd_ListIteratorOfListOfInteger.hxx> #include <TColStd_ListIteratorOfListOfInteger.hxx>
#include <stdio.h> #include <stdio.h>
//#if defined(WNT) || defined(LIN)
//#endif // WNT
//-- ================================================================================ //-- ================================================================================
//-- lbr le 27 fev 97 //-- lbr le 27 fev 97
//-- //--

14
src/CDF/CDF_FWOSDriver.cxx
View File

@ -25,9 +25,9 @@
#include <TCollection_ExtendedString.hxx> #include <TCollection_ExtendedString.hxx>
#include <UTL.hxx> #include <UTL.hxx>
#ifdef WNT #ifdef _MSC_VER
#include <tchar.h> #include <tchar.h>
#endif // WNT #endif // _MSC_VER
//============================================================================== //==============================================================================
@ -35,11 +35,11 @@
//purpose : //purpose :
//============================================================================== //==============================================================================
static void PutSlash (TCollection_ExtendedString& anXSTRING) { static void PutSlash (TCollection_ExtendedString& anXSTRING) {
#ifdef WNT #ifdef _WIN32
anXSTRING+="\\"; anXSTRING+="\\";
#else #else
anXSTRING+="/"; anXSTRING+="/";
#endif // WNT #endif // _WIN32
} }
//============================================================================== //==============================================================================
@ -169,7 +169,7 @@ TCollection_ExtendedString CDF_FWOSDriver::DefaultFolder()
TCollection_ExtendedString theDefaultFolder; TCollection_ExtendedString theDefaultFolder;
if (theDefaultFolder.Length() == 0) { if (theDefaultFolder.Length() == 0) {
#ifdef WNT #ifdef _WIN32
TCollection_ExtendedString hd=UTL::xgetenv("HOMEDRIVE"); TCollection_ExtendedString hd=UTL::xgetenv("HOMEDRIVE");
if(hd.Length() != NULL) { if(hd.Length() != NULL) {
theDefaultFolder=hd; theDefaultFolder=hd;
@ -218,7 +218,7 @@ TCollection_ExtendedString CDF_FWOSDriver::SetName(const Handle(CDM_Document)& a
TCollection_ExtendedString xn(aName), n(aName); TCollection_ExtendedString xn(aName), n(aName);
#ifdef WNT #ifdef _WIN32
//windows is not case sensitive //windows is not case sensitive
//make the extension lower case //make the extension lower case
for(int i = 1; i <= xn.Length(); i++) 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 e (aDocument->FileExtension());
TCollection_ExtendedString xe(e); TCollection_ExtendedString xe(e);
if (e.Length() > 0) { if (e.Length() > 0) {
#ifdef WNT #ifdef _WIN32
//windows is not case sensitive //windows is not case sensitive
//make the extension lower case //make the extension lower case
for(int i = 1; i <= xe.Length(); i++) for(int i = 1; i <= xe.Length(); i++)

2
src/CDF/CDF_Store.cxx
View File

@ -122,7 +122,7 @@ Standard_Boolean CDF_Store::SetFolder(const TCollection_ExtendedString& aFolder
// it is removed. // it is removed.
// This is correct for Unix systems but not for Windows! VMS and MAC? Thomas Haller, 23.11.01 // This is correct for Unix systems but not for Windows! VMS and MAC? Thomas Haller, 23.11.01
if(l > 1) { if(l > 1) {
#ifndef WNT #ifndef _WIN32
if(theFolder.Value(l) == theFolder.Value(1)) theFolder.Trunc(l-1); if(theFolder.Value(l) == theFolder.Value(1)) theFolder.Trunc(l-1);
#else #else
if (theFolder.Value(l) == '/' || theFolder.Value(l) == '\\') if (theFolder.Value(l) == '/' || theFolder.Value(l) == '\\')

2
src/DBRep/DBRep_DrawableShape.cxx
View File

@ -69,7 +69,7 @@ static Standard_Integer PlotCount = 0; // PlotEdge and PlotIso for cases of "
// PlotEdge or PlotIso // PlotEdge or PlotIso
static TopoDS_Shape pickshape; static TopoDS_Shape pickshape;
static Standard_Real upick,vpick; static Standard_Real upick,vpick;
#ifdef WNT #ifdef _WIN32
extern Draw_Viewer dout; extern Draw_Viewer dout;
#endif #endif

2
src/DDF/DDF_BrowserCommands.cxx
View File

@ -33,7 +33,7 @@
#include <TCollection_HAsciiString.hxx> #include <TCollection_HAsciiString.hxx>
#include <OSD_File.hxx> #include <OSD_File.hxx>
#ifdef WNT #ifdef _MSC_VER
#include <stdio.h> #include <stdio.h>
#endif #endif

2
src/DDF/DDF_IOStream.hxx
View File

@ -222,7 +222,7 @@ ostream* myOStream;
}; };
#ifdef WNT #ifdef _MSC_VER
#pragma warning (default : 4275) #pragma warning (default : 4275)
#endif #endif

4
src/DDataStd/DDataStd_BasicCommands.cxx
View File

@ -1232,7 +1232,7 @@ static Standard_Integer DDataStd_KeepUTF (Draw_Interpretor& di,
DDF::AddLabel(DF, arg[2], L); DDF::AddLabel(DF, arg[2], L);
Standard_CString aFileName(arg[3]); Standard_CString aFileName(arg[3]);
#ifdef WNT #ifdef _MSC_VER
ifstream anIS (aFileName, ios::in | ios::binary); ifstream anIS (aFileName, ios::in | ios::binary);
#else #else
ifstream anIS (aFileName); ifstream anIS (aFileName);
@ -1304,7 +1304,7 @@ static Standard_Integer DDataStd_GetUTFtoFile (Draw_Interpretor& di,
Standard_CString aFileName(arg[3]); Standard_CString aFileName(arg[3]);
#ifdef WNT #ifdef _MSC_VER
ofstream anOS (aFileName, ios::in | ios::binary | ios::ate); ofstream anOS (aFileName, ios::in | ios::binary | ios::ate);
#else #else
ofstream anOS (aFileName, ios::ate); ofstream anOS (aFileName, ios::ate);

2
src/DDataStd/DDataStd_DrawDisplayCommands.cxx
View File

@ -52,7 +52,7 @@
#include <DDataStd_DrawPresentation.hxx> #include <DDataStd_DrawPresentation.hxx>
#include <DDataStd_DrawDriver.hxx> #include <DDataStd_DrawDriver.hxx>
#ifndef WNT #ifndef _WIN32
extern Draw_Viewer dout; extern Draw_Viewer dout;
#else #else
Standard_IMPORT Draw_Viewer dout; Standard_IMPORT Draw_Viewer dout;

2
src/DDataStd/DDataStd_DrawPresentation.cxx
View File

@ -31,7 +31,7 @@
#include <TDF_RelocationTable.hxx> #include <TDF_RelocationTable.hxx>
#include <TDF_Tool.hxx> #include <TDF_Tool.hxx>
#ifndef WNT #ifndef _WIN32
extern Draw_Viewer dout; extern Draw_Viewer dout;
#else #else
Standard_IMPORT Draw_Viewer dout; Standard_IMPORT Draw_Viewer dout;

2
src/DNaming/DNaming_BasicCommands.cxx
View File

@ -53,7 +53,7 @@
#include <gp_Trsf.hxx> #include <gp_Trsf.hxx>
#include <TColStd_HArray1OfInteger.hxx> #include <TColStd_HArray1OfInteger.hxx>
//#ifdef WNT //#ifdef _MSC_VER
#include <stdio.h> #include <stdio.h>
//#endif //#endif

2
src/DNaming/DNaming_ModelingCommands.cxx
View File

@ -71,7 +71,7 @@
#include <DNaming_SphereDriver.hxx> #include <DNaming_SphereDriver.hxx>
#include <DNaming_PointDriver.hxx> #include <DNaming_PointDriver.hxx>
#include <DNaming_Line3DDriver.hxx> #include <DNaming_Line3DDriver.hxx>
#ifdef WNT #ifdef _WIN32
#define EXCEPTION ... #define EXCEPTION ...
#else #else
#define EXCEPTION Standard_Failure #define EXCEPTION Standard_Failure

2
src/DNaming/DNaming_TransformationDriver.cxx
View File

@ -53,7 +53,7 @@
#include <TopTools_MapIteratorOfMapOfShape.hxx> #include <TopTools_MapIteratorOfMapOfShape.hxx>
#include <TopTools_MapOfShape.hxx> #include <TopTools_MapOfShape.hxx>
#ifdef WNT #ifdef _WIN32
#define EXCEPTION ... #define EXCEPTION ...
#else #else
#define EXCEPTION Standard_Failure #define EXCEPTION Standard_Failure

2
src/DPrsStd/DPrsStd.cxx
View File

@ -32,7 +32,7 @@
//#include <AppStdL_Application.hxx> //#include <AppStdL_Application.hxx>
// avoid warnings on 'extern "C"' functions returning C++ classes // avoid warnings on 'extern "C"' functions returning C++ classes
#ifdef WNT #ifdef _MSC_VER
#pragma warning(4:4190) #pragma warning(4:4190)
#endif #endif
//static Handle(AppStdL_Application) stdApp; //static Handle(AppStdL_Application) stdApp;

2
src/Draw/COMMANDWINDOW.h
View File

@ -14,7 +14,7 @@
commercial license or contractual agreement. commercial license or contractual agreement.
*/ */
#ifdef WNT #ifdef _WIN32
#define COMMANDCLASS "COMMANDWINDOW" #define COMMANDCLASS "COMMANDWINDOW"

2
src/Draw/CommandWindow.cxx
View File

@ -14,7 +14,7 @@
// Alternatively, this file may be used under the terms of Open CASCADE // Alternatively, this file may be used under the terms of Open CASCADE
// commercial license or contractual agreement. // commercial license or contractual agreement.
#ifdef WNT #ifdef _WIN32
#include <windows.h> #include <windows.h>
#define COMMANDCLASS "COMMANDWINDOW" #define COMMANDCLASS "COMMANDWINDOW"

28
src/Draw/Draw.cxx
View File

@ -76,7 +76,7 @@ Standard_EXPORT Standard_Boolean Draw_Interprete(const char* command);
// ******************************************************************* // *******************************************************************
// read an init file // read an init file
// ******************************************************************* // *******************************************************************
#ifdef WNT #ifdef _WIN32
extern console_semaphore_value volatile console_semaphore; extern console_semaphore_value volatile console_semaphore;
extern char console_command[1000]; extern char console_command[1000];
#endif #endif
@ -84,7 +84,7 @@ extern char console_command[1000];
static void ReadInitFile (const TCollection_AsciiString& theFileName) static void ReadInitFile (const TCollection_AsciiString& theFileName)
{ {
TCollection_AsciiString aPath = theFileName; TCollection_AsciiString aPath = theFileName;
#ifdef WNT #ifdef _WIN32
if (!Draw_Batch) { if (!Draw_Batch) {
try { try {
aPath.ChangeAll ('\\', '/'); aPath.ChangeAll ('\\', '/');
@ -104,7 +104,7 @@ static void ReadInitFile (const TCollection_AsciiString& theFileName)
Sprintf (com, "source %s", aPath.ToCString()); Sprintf (com, "source %s", aPath.ToCString());
Draw_Interprete (com); Draw_Interprete (com);
delete [] com; delete [] com;
#ifdef WNT #ifdef _WIN32
} }
#endif #endif
} }
@ -123,7 +123,7 @@ Handle(Draw_ProgressIndicator) Draw::GetProgressBar()
return PInd; return PInd;
} }
#ifndef WNT #ifndef _WIN32
/*--------------------------------------------------------*\ /*--------------------------------------------------------*\
| exitProc: finalization handler for Tcl/Tk thread. Forces parent process to die | 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 // init X window and create display
// ***************************************************************** // *****************************************************************
#ifdef WNT #ifdef _WIN32
HWND hWnd = NULL; HWND hWnd = NULL;
#endif #endif
if (!Draw_Batch) if (!Draw_Batch)
#ifdef WNT #ifdef _WIN32
Draw_Batch=!Init_Appli(hInst, hPrevInst, nShow, hWnd); Draw_Batch=!Init_Appli(hInst, hPrevInst, nShow, hWnd);
#else #else
Draw_Batch=!Init_Appli(); Draw_Batch=!Init_Appli();
@ -294,7 +294,7 @@ void Draw_Appli(Standard_Integer argc, char** argv,const FDraw_InitAppli Draw_In
// ***************************************************************** // *****************************************************************
Draw_InitAppli(theCommands); Draw_InitAppli(theCommands);
#ifndef WNT #ifndef _WIN32
Tcl_CreateExitHandler(exitProc, 0); Tcl_CreateExitHandler(exitProc, 0);
#endif #endif
@ -307,7 +307,7 @@ void Draw_Appli(Standard_Integer argc, char** argv,const FDraw_InitAppli Draw_In
{ {
if (getenv ("CASROOT") == NULL) if (getenv ("CASROOT") == NULL)
{ {
#ifdef WNT #ifdef _WIN32
ReadInitFile ("ddefault"); ReadInitFile ("ddefault");
#else #else
cout << " the CASROOT variable is mandatory to Run OpenCascade "<< endl; 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); ReadInitFile (aRunFile);
// provide a clean exit, this is useful for some analysis tools // provide a clean exit, this is useful for some analysis tools
if ( ! isInteractiveForced ) if ( ! isInteractiveForced )
#ifndef WNT #ifndef _WIN32
return; return;
#else #else
ExitProcess(0); ExitProcess(0);
@ -343,7 +343,7 @@ void Draw_Appli(Standard_Integer argc, char** argv,const FDraw_InitAppli Draw_In
Draw_Interprete (aCommand.ToCString()); Draw_Interprete (aCommand.ToCString());
// provide a clean exit, this is useful for some analysis tools // provide a clean exit, this is useful for some analysis tools
if ( ! isInteractiveForced ) if ( ! isInteractiveForced )
#ifndef WNT #ifndef _WIN32
return; return;
#else #else
ExitProcess(0); ExitProcess(0);
@ -354,7 +354,7 @@ void Draw_Appli(Standard_Integer argc, char** argv,const FDraw_InitAppli Draw_In
// X loop // X loop
// ***************************************************************** // *****************************************************************
if (XLoop) { if (XLoop) {
#ifdef WNT #ifdef _WIN32
Run_Appli(hWnd); Run_Appli(hWnd);
#else #else
Run_Appli(Draw_Interprete); Run_Appli(Draw_Interprete);
@ -372,7 +372,7 @@ void Draw_Appli(Standard_Integer argc, char** argv,const FDraw_InitAppli Draw_In
cmd[i] = '\0'; cmd[i] = '\0';
} while (Draw_Interprete(cmd) != (unsigned int ) -2); } while (Draw_Interprete(cmd) != (unsigned int ) -2);
} }
#ifdef WNT #ifdef _WIN32
// Destruction de l'application // Destruction de l'application
Destroy_Appli(hInst); Destroy_Appli(hInst);
#endif #endif
@ -491,11 +491,11 @@ void Draw::Load(Draw_Interpretor& theDI, const TCollection_AsciiString& theKey,
} }
TCollection_AsciiString aPluginLibrary(""); TCollection_AsciiString aPluginLibrary("");
#ifndef WNT #ifndef _WIN32
aPluginLibrary += "lib"; aPluginLibrary += "lib";
#endif #endif
aPluginLibrary += aPluginResource->Value(theKey.ToCString()); aPluginLibrary += aPluginResource->Value(theKey.ToCString());
#ifdef WNT #ifdef _WIN32
aPluginLibrary += ".dll"; aPluginLibrary += ".dll";
#elif __APPLE__ #elif __APPLE__
aPluginLibrary += ".dylib"; aPluginLibrary += ".dylib";

2
src/Draw/DrawRessource.h
View File

@ -14,7 +14,7 @@
commercial license or contractual agreement. commercial license or contractual agreement.
*/ */
#ifdef WNT #ifdef _MSC_VER
//{{NO_DEPENDENCIES}} //{{NO_DEPENDENCIES}}
// Microsoft Developer Studio generated include file. // Microsoft Developer Studio generated include file.

6
src/Draw/Draw_Appli.hxx
View File

@ -29,7 +29,7 @@
typedef void (*FDraw_InitAppli)(Draw_Interpretor&); typedef void (*FDraw_InitAppli)(Draw_Interpretor&);
#ifdef WNT #ifdef _WIN32
#include <windows.h> #include <windows.h>
//extern void Draw_Appli(HINSTANCE,HINSTANCE,LPSTR,int); //extern void Draw_Appli(HINSTANCE,HINSTANCE,LPSTR,int);
Standard_EXPORT 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 #ifndef __Draw_API
# ifdef __Draw_DLL # ifdef __Draw_DLL
# define __Draw_API __declspec ( dllexport ) # define __Draw_API __declspec ( dllexport )
@ -54,7 +54,7 @@ extern void Draw_Appli(Standard_Integer argc, char** argv,
#endif #endif
#ifndef WNT #ifndef _WIN32
extern Draw_Viewer dout; extern Draw_Viewer dout;
extern Standard_Boolean Draw_Batch; extern Standard_Boolean Draw_Batch;
#endif #endif

2
src/Draw/Draw_Grid.cxx
View File

@ -27,9 +27,7 @@
static Standard_Real MinimumStep = 1.e-3 ; static Standard_Real MinimumStep = 1.e-3 ;
static Standard_Real Ratio = 200.0 ; static Standard_Real Ratio = 200.0 ;
//#ifdef WNT
extern Draw_Viewer dout; extern Draw_Viewer dout;
//#endif
//======================================================================= //=======================================================================
// Function : Draw_Grid // Function : Draw_Grid

4
src/Draw/Draw_Interpretor.cxx
View File

@ -198,7 +198,7 @@ static Standard_Integer CommandCmd
cout << "An exception was caught " << E << endl; cout << "An exception was caught " << E << endl;
if (cc && Draw::Atoi(cc)) { if (cc && Draw::Atoi(cc)) {
#ifdef WNT #ifdef _WIN32
Tcl_Exit(0); Tcl_Exit(0);
#else #else
Tcl_Eval(interp,"exit"); Tcl_Eval(interp,"exit");
@ -566,7 +566,7 @@ Draw_Interpretor::~Draw_Interpretor()
#endif #endif
} }
#else #else
#ifdef WNT #ifdef _WIN32
Tcl_Exit(0); Tcl_Exit(0);
#endif #endif
#endif #endif

4
src/Draw/Draw_Main.cxx
View File

@ -53,7 +53,7 @@
#include <tcl.h> #include <tcl.h>
#ifdef WNT #ifdef _WIN32
#include <sys/stat.h> #include <sys/stat.h>
#include <Draw_Window.hxx> #include <Draw_Window.hxx>
@ -78,7 +78,7 @@ Standard_IMPORT Standard_Boolean Draw_Interprete(const char* command); //for C30
static FDraw_InitAppli theDraw_InitAppli; //pointer to the Draw_InitAppli static FDraw_InitAppli theDraw_InitAppli; //pointer to the Draw_InitAppli
#endif #endif
#ifdef WNT #ifdef _WIN32
//======================================================================= //=======================================================================
//NOTE: OCC11 //NOTE: OCC11
// On Windows NT, both console (UNIX-like) and windowed (classical on // On Windows NT, both console (UNIX-like) and windowed (classical on

4
src/Draw/Draw_Main.hxx
View File

@ -30,7 +30,7 @@
typedef void (*FDraw_InitAppli)(Draw_Interpretor&); typedef void (*FDraw_InitAppli)(Draw_Interpretor&);
#ifndef WNT #ifndef _WIN32
Standard_EXPORT Standard_Integer _main_ (Standard_Integer argc, Standard_EXPORT Standard_Integer _main_ (Standard_Integer argc,
Standard_PCharacter argv[], Standard_PCharacter argv[],
const FDraw_InitAppli Draw_InitAppli); const FDraw_InitAppli Draw_InitAppli);
@ -49,7 +49,7 @@ Standard_EXPORT Standard_Integer _main_ (int argc,
#endif #endif
// Declarations of macros DRAW_MAIN to be used in executables instead of explicit main/WinMain // Declarations of macros DRAW_MAIN to be used in executables instead of explicit main/WinMain
#ifndef WNT #ifndef _WIN32
// main() // main()
#define DRAW_MAIN int main (Standard_Integer argc, char* argv[])\ #define DRAW_MAIN int main (Standard_Integer argc, char* argv[])\
{return _main_ (argc, argv, Draw_InitAppli);} {return _main_ (argc, argv, Draw_InitAppli);}

4
src/Draw/Draw_Viewer.cxx
View File

@ -114,7 +114,7 @@ void Draw_Viewer::MakeView(const Standard_Integer id,
} }
} }
#ifdef WNT #ifdef _WIN32
//======================================================================= //=======================================================================
//function : MakeView //function : MakeView
//purpose : //purpose :
@ -590,7 +590,7 @@ void Draw_Viewer::RepaintView (const Standard_Integer id) const
} }
#ifdef WNT #ifdef _WIN32
//======================================================================= //=======================================================================
//function : ResizeView //function : ResizeView
//purpose : WNT re-drawing optimization //purpose : WNT re-drawing optimization

6
src/Draw/Draw_Viewer.hxx
View File

@ -29,7 +29,7 @@
#include <Draw_SequenceOfDrawable3D.hxx> #include <Draw_SequenceOfDrawable3D.hxx>
#include <Draw_Color.hxx> #include <Draw_Color.hxx>
#ifdef WNT #ifdef _WIN32
#include <windows.h> #include <windows.h>
#if !defined(__Draw_API) && !defined(HAVE_NO_DLL) #if !defined(__Draw_API) && !defined(HAVE_NO_DLL)
# ifdef __Draw_DLL # ifdef __Draw_DLL
@ -56,7 +56,7 @@ class Draw_Viewer {
const Standard_Integer X, const Standard_Integer Y, const Standard_Integer X, const Standard_Integer Y,
const Standard_Integer W, const Standard_Integer H); const Standard_Integer W, const Standard_Integer H);
// build a view on a given window // build a view on a given window
#ifdef WNT #ifdef _WIN32
__Draw_API void MakeView (const Standard_Integer id, __Draw_API void MakeView (const Standard_Integer id,
const char* typ, const char* typ,
const Standard_Integer X, const Standard_Integer Y, 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 ClearView (const Standard_Integer id) const;
__Draw_API void RemoveView (const Standard_Integer id) ; __Draw_API void RemoveView (const Standard_Integer id) ;
__Draw_API void RepaintView (const Standard_Integer id) const; __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 ResizeView (const Standard_Integer id) const;
__Draw_API void UpdateView (const Standard_Integer id, const Standard_Boolean forced = Standard_False) const; __Draw_API void UpdateView (const Standard_Integer id, const Standard_Boolean forced = Standard_False) const;
#endif #endif

2
src/Draw/Draw_Window.cxx
View File

@ -15,7 +15,7 @@
// commercial license or contractual agreement. // commercial license or contractual agreement.
// include windows.h first to have all definitions available // include windows.h first to have all definitions available
#ifdef WNT #ifdef _WIN32
#include <windows.h> #include <windows.h>
#endif #endif

2
src/Draw/MAINWINDOW.h
View File

@ -19,7 +19,7 @@
/** MainWindow.h /** MainWindow.h
*/ */
/*\****************************************************/ /*\****************************************************/
#ifdef WNT #ifdef _WIN32
#define CLIENTWND 0 #define CLIENTWND 0

2
src/Draw/MainWindow.cxx
View File

@ -14,7 +14,7 @@
// Alternatively, this file may be used under the terms of Open CASCADE // Alternatively, this file may be used under the terms of Open CASCADE
// commercial license or contractual agreement. // commercial license or contractual agreement.
#ifdef WNT #ifdef _WIN32
#include <windows.h> #include <windows.h>
#include <DrawRessource.h> #include <DrawRessource.h>

2
src/Draw/init.cxx
View File

@ -14,7 +14,7 @@
// Alternatively, this file may be used under the terms of Open CASCADE // Alternatively, this file may be used under the terms of Open CASCADE
// commercial license or contractual agreement. // commercial license or contractual agreement.
#ifdef WNT #ifdef _WIN32
// include windows.h first to have all definitions available // include windows.h first to have all definitions available
#include <windows.h> #include <windows.h>

2
src/Draw/init.h
View File

@ -14,7 +14,7 @@
commercial license or contractual agreement. commercial license or contractual agreement.
*/ */
#ifdef WNT #ifdef _WIN32
#define APPCLASS "TDRAW" #define APPCLASS "TDRAW"
#define APPTITLE "Windows NT TDRAW" #define APPTITLE "Windows NT TDRAW"

2
src/DrawDim/DrawDim.cxx
View File

@ -39,7 +39,7 @@
#include <TopoDS_Shape.hxx> #include <TopoDS_Shape.hxx>
#include <TopoDS_Vertex.hxx> #include <TopoDS_Vertex.hxx>
#ifdef WNT #ifdef _WIN32
Standard_IMPORT Draw_Viewer dout; Standard_IMPORT Draw_Viewer dout;
#endif #endif

2
src/DrawDim/DrawDim_PlanarDimensionCommands.cxx
View File

@ -42,7 +42,7 @@
#include <gp_Ax3.hxx> #include <gp_Ax3.hxx>
#include <gp_Pln.hxx> #include <gp_Pln.hxx>
#include <DrawTrSurf.hxx> #include <DrawTrSurf.hxx>
#ifdef WNT #ifdef _MSC_VER
#include <stdio.h> #include <stdio.h>
#endif #endif
//======================================================================= //=======================================================================

2
src/DrawTrSurf/DrawTrSurf_Triangulation.cxx
View File

@ -29,8 +29,6 @@
#include <TColStd_Array1OfInteger.hxx> #include <TColStd_Array1OfInteger.hxx>
#include <stdio.h> #include <stdio.h>
//#ifdef WNT
//#endif
//======================================================================= //=======================================================================
//function : DrawTrSurf_Triangulation //function : DrawTrSurf_Triangulation
//purpose : //purpose :

2
src/DrawTrSurf/DrawTrSurf_Triangulation2D.cxx
View File

@ -29,7 +29,7 @@
#include <TColgp_Array1OfPnt2d.hxx> #include <TColgp_Array1OfPnt2d.hxx>
#include <TColStd_Array1OfInteger.hxx> #include <TColStd_Array1OfInteger.hxx>
#ifdef WNT #ifdef _MSC_VER
#include <stdio.h> #include <stdio.h>
#endif #endif

3
src/DsgPrs/DsgPrs_FilletRadiusPresentation.cxx
View File

@ -46,9 +46,6 @@
#include <TCollection_ExtendedString.hxx> #include <TCollection_ExtendedString.hxx>
#include <stdio.h> #include <stdio.h>
//pop pour NT
//#if WNT
//#endif
//======================================================================= //=======================================================================
//function : Add //function : Add
//purpose : //purpose :

4
src/Expr/Expr_Operators.hxx
View File

@ -26,7 +26,7 @@
#include <Expr_Division.hxx> #include <Expr_Division.hxx>
#ifndef __Expr_API #ifndef __Expr_API
# if defined(WNT) && !defined(HAVE_NO_DLL) # if defined(_WIN32) && !defined(HAVE_NO_DLL)
# ifdef __Expr_DLL # ifdef __Expr_DLL
# define __Expr_API __declspec( dllexport ) # define __Expr_API __declspec( dllexport )
# else # else
@ -34,7 +34,7 @@
# endif // __Expr_DLL # endif // __Expr_DLL
# else # else
# define __Expr_API # define __Expr_API
# endif // WNT # endif // _WIN32
#endif // __Expr_API #endif // __Expr_API
//__Expr_API Handle(Expr_Sum) operator+(const Handle(Expr_GeneralExpression)& x,const Handle(Expr_GeneralExpression)& y); //__Expr_API Handle(Expr_Sum) operator+(const Handle(Expr_GeneralExpression)& x,const Handle(Expr_GeneralExpression)& y);

2
src/ExprIntrp/ExprIntrp_yaccanal.hxx
View File

@ -20,7 +20,7 @@
#include <ExprIntrp_Analysis.hxx> #include <ExprIntrp_Analysis.hxx>
#ifndef _ExprIntrp_API #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_API Standard_EXPORT
# define __ExprIntrp_APIEXTERN Standard_EXPORTEXTERN # define __ExprIntrp_APIEXTERN Standard_EXPORTEXTERN
# else # else

4
src/ExprIntrp/ExprIntrp_yacclex.cxx
View File

@ -20,11 +20,11 @@
static TCollection_AsciiString ExprIntrp_curres; static TCollection_AsciiString ExprIntrp_curres;
static int ExprIntrp_degree; static int ExprIntrp_degree;
#ifndef WNT #ifndef _WIN32
extern char* ExprIntrptext; extern char* ExprIntrptext;
#else #else
extern "C" char* ExprIntrptext; extern "C" char* ExprIntrptext;
#endif // WNT #endif // _WIN32
extern "C" void ExprIntrp_SetResult() extern "C" void ExprIntrp_SetResult()

4
src/ExprIntrp/lex.ExprIntrp.c
View File

@ -28,10 +28,10 @@
#include <stdio.h> #include <stdio.h>
#ifdef WNT #ifdef _MSC_VER
# include <stdlib.h> # include <stdlib.h>
# include <io.h> # include <io.h>
#endif /* WNT */ #endif /* _MSC_VER */

2
src/GeomToIGES/GeomToIGES_GeomSurface.cxx
View File

@ -298,7 +298,7 @@ Handle(IGESData_IGESEntity) GeomToIGES_GeomSurface::TransferSurface(const Handle
} }
} }
catch ( Standard_Failure ) { catch ( Standard_Failure ) {
#ifdef DEB #ifdef OCCT_DEBUG
cout << "Warning: GeomToIGES_GeomSurface: can't trim bspline" << endl; cout << "Warning: GeomToIGES_GeomSurface: can't trim bspline" << endl;
cout << "Warning: Exception in Segment(): " ; cout << "Warning: Exception in Segment(): " ;
Standard_Failure::Caught()->Print(cout); Standard_Failure::Caught()->Print(cout);

2
src/GeometryTest/GeometryTest_API2dCommands.cxx
View File

@ -36,7 +36,7 @@
#include <GeomAbs_Shape.hxx> #include <GeomAbs_Shape.hxx>
#include <stdio.h> #include <stdio.h>
#ifdef WNT #ifdef _WIN32
Standard_IMPORT Draw_Viewer dout; Standard_IMPORT Draw_Viewer dout;
#endif #endif

2
src/GeometryTest/GeometryTest_APICommands.cxx
View File

@ -39,7 +39,7 @@
#include <TColStd_Array2OfReal.hxx> #include <TColStd_Array2OfReal.hxx>
#include <Precision.hxx> #include <Precision.hxx>
#include <stdio.h> #include <stdio.h>
#ifdef WNT #ifdef _WIN32
Standard_IMPORT Draw_Viewer dout; Standard_IMPORT Draw_Viewer dout;
#endif #endif

3
src/GeometryTest/GeometryTest_ConstraintCommands.cxx
View File

@ -64,9 +64,8 @@
#include <GC_MakeSegment.hxx> #include <GC_MakeSegment.hxx>
#include <GC_MakeArcOfCircle.hxx> #include <GC_MakeArcOfCircle.hxx>
//#ifdef WNT
#include <stdio.h> #include <stdio.h>
#ifdef WNT #ifdef _WIN32
Standard_IMPORT Draw_Viewer dout; Standard_IMPORT Draw_Viewer dout;
#endif #endif
Standard_IMPORT Draw_Color DrawTrSurf_CurveColor(const Draw_Color); Standard_IMPORT Draw_Color DrawTrSurf_CurveColor(const Draw_Color);

2
src/GeometryTest/GeometryTest_CurveCommands.cxx
View File

@ -130,7 +130,7 @@
#include <GCPnts_UniformAbscissa.hxx> #include <GCPnts_UniformAbscissa.hxx>
#include <DBRep.hxx> #include <DBRep.hxx>
#ifdef WNT #ifdef _WIN32
Standard_IMPORT Draw_Viewer dout; Standard_IMPORT Draw_Viewer dout;
#endif #endif

2
src/GeometryTest/GeometryTest_PolyCommands.cxx
View File

@ -29,7 +29,7 @@
#include <TColgp_Array1OfPnt.hxx> #include <TColgp_Array1OfPnt.hxx>
#include <TColgp_Array1OfPnt2d.hxx> #include <TColgp_Array1OfPnt2d.hxx>
#ifdef WNT #ifdef _WIN32
Standard_IMPORT Draw_Viewer dout; Standard_IMPORT Draw_Viewer dout;
#endif #endif
//======================================================================= //=======================================================================

5
src/GeometryTest/GeometryTest_SurfaceCommands.cxx
View File

@ -61,9 +61,12 @@
#include <DrawTrSurf_BezierSurface.hxx> #include <DrawTrSurf_BezierSurface.hxx>
#include <DrawTrSurf_BSplineSurface.hxx> #include <DrawTrSurf_BSplineSurface.hxx>
#ifdef WNT #ifdef _MSC_VER
#include <stdio.h> #include <stdio.h>
//#define strcasecmp strcmp Already defined //#define strcasecmp strcmp Already defined
#endif
#ifdef _WIN32
Standard_IMPORT Draw_Viewer dout; Standard_IMPORT Draw_Viewer dout;
#endif #endif

2
src/GeometryTest/GeometryTest_TestProjCommands.cxx
View File

@ -27,7 +27,7 @@
#include <Draw_Marker3D.hxx> #include <Draw_Marker3D.hxx>
#include <stdio.h> #include <stdio.h>
#ifdef WNT #ifdef _WIN32
Standard_IMPORT Draw_Viewer dout; Standard_IMPORT Draw_Viewer dout;
#endif #endif

2
src/GeomliteTest/GeomliteTest_API2dCommands.cxx
View File

@ -44,7 +44,7 @@
#include <IntRes2d_IntersectionPoint.hxx> #include <IntRes2d_IntersectionPoint.hxx>
#include <stdio.h> #include <stdio.h>
#ifdef WNT #ifdef _WIN32
Standard_IMPORT Draw_Viewer dout; Standard_IMPORT Draw_Viewer dout;
#endif #endif

5
src/GeomliteTest/GeomliteTest_ApproxCommands.cxx
View File

@ -60,8 +60,11 @@
#include <AppDef_Array1OfMultiPointConstraint.hxx> #include <AppDef_Array1OfMultiPointConstraint.hxx>
#include <math_Vector.hxx> #include <math_Vector.hxx>
#ifdef WNT #ifdef _MSC_VER
#include <stdio.h> #include <stdio.h>
#endif
#ifdef _WIN32
Standard_IMPORT Draw_Viewer dout; Standard_IMPORT Draw_Viewer dout;
#endif #endif

2
src/GeomliteTest/GeomliteTest_CurveCommands.cxx
View File

@ -108,7 +108,7 @@
#include <Approx_CurvilinearParameter.hxx> #include <Approx_CurvilinearParameter.hxx>
#include <Approx_CurveOnSurface.hxx> #include <Approx_CurveOnSurface.hxx>
#include <Geom_BSplineSurface.hxx> #include <Geom_BSplineSurface.hxx>
#ifdef WNT #ifdef _WIN32
Standard_IMPORT Draw_Viewer dout; Standard_IMPORT Draw_Viewer dout;
#endif #endif

2
src/GeomliteTest/GeomliteTest_ModificationCommands.cxx
View File

@ -33,7 +33,7 @@
#include <Geom_BoundedCurve.hxx> #include <Geom_BoundedCurve.hxx>
#include <Geom_BoundedSurface.hxx> #include <Geom_BoundedSurface.hxx>
#ifdef WNT #ifdef _MSC_VER
#include <stdio.h> #include <stdio.h>
//#define strcasecmp strcmp Already defined //#define strcasecmp strcmp Already defined
#endif #endif

2
src/GeomliteTest/GeomliteTest_SurfaceCommands.cxx
View File

@ -82,10 +82,8 @@
#include <DBRep.hxx> #include <DBRep.hxx>
#include <Geom_Curve.hxx> #include <Geom_Curve.hxx>
//#ifdef WNT
#include <stdio.h> #include <stdio.h>
#ifdef _WIN32 #ifdef _WIN32
//#define strcasecmp strcmp Already defined
Standard_IMPORT Draw_Viewer dout; Standard_IMPORT Draw_Viewer dout;
#endif #endif

2
src/HLRTest/HLRTest.cxx
View File

@ -31,7 +31,7 @@
#include <TopoDS_Shape.hxx> #include <TopoDS_Shape.hxx>
static Handle(HLRBRep_Algo) hider; static Handle(HLRBRep_Algo) hider;
#ifdef WNT #ifdef _WIN32
Standard_IMPORT Draw_Viewer dout; Standard_IMPORT Draw_Viewer dout;
#endif #endif

2
src/IGESToBRep/IGESToBRep_Reader.cxx
View File

@ -62,7 +62,7 @@
#include <stdio.h> #include <stdio.h>
//#include <ShapeCustom.hxx> //#include <ShapeCustom.hxx>
#ifdef WNT #ifdef _MSC_VER
#include <stdlib.h> #include <stdlib.h>
#else #else
#include <errno.h> #include <errno.h>

2
src/IntImp/IntImp_ComputeTangence.hxx
View File

@ -15,7 +15,7 @@
#include <gp_Vec.hxx> #include <gp_Vec.hxx>
#include <IntImp_ConstIsoparametric.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; Standard_EXPORTEXTERN const IntImp_ConstIsoparametric *ChoixRef;
#else #else
Standard_IMPORT const IntImp_ConstIsoparametric *ChoixRef; Standard_IMPORT const IntImp_ConstIsoparametric *ChoixRef;

2
src/IntTools/IntTools.cxx
View File

@ -377,6 +377,6 @@ namespace {
return 1; return 1;
} }
#ifdef WNT #ifdef _MSC_VER
#pragma warning ( default : 4101 ) #pragma warning ( default : 4101 )
#endif #endif

2
src/IntTools/IntTools_EdgeFace.cxx
View File

@ -1545,6 +1545,6 @@ Standard_Integer AdaptiveDiscret (const Standard_Integer iDiscret,
} }
#ifdef WNT #ifdef _MSC_VER
#pragma warning ( default : 4101 ) #pragma warning ( default : 4101 )
#endif #endif

4
src/Interface/Interface_CheckTool.cxx
View File

@ -32,7 +32,7 @@
#include <Standard_Transient.hxx> #include <Standard_Transient.hxx>
#include <TCollection_HAsciiString.hxx> #include <TCollection_HAsciiString.hxx>
#ifdef WNT #ifdef _WIN32
#include <OSD_Exception.hxx> #include <OSD_Exception.hxx>
#else #else
#include <OSD_Signal.hxx> #include <OSD_Signal.hxx>
@ -49,7 +49,7 @@ static void raisecheck (Handle(Interface_Check)& ach)
sprintf (mess,"** Exception Raised during Check : %s **", sprintf (mess,"** Exception Raised during Check : %s **",
afail->DynamicType()->Name()); afail->DynamicType()->Name());
ach->AddFail(mess); ach->AddFail(mess);
#ifdef WNT #ifdef _WIN32
if (afail->IsKind(STANDARD_TYPE(OSD_Exception))) if (afail->IsKind(STANDARD_TYPE(OSD_Exception)))
#else #else
if (afail->IsKind(STANDARD_TYPE(OSD_Signal))) if (afail->IsKind(STANDARD_TYPE(OSD_Signal)))

4
src/Interface/Interface_FileReaderTool.cxx
View File

@ -36,7 +36,7 @@
#include <Standard_Transient.hxx> #include <Standard_Transient.hxx>
#include <Standard_TypeMismatch.hxx> #include <Standard_TypeMismatch.hxx>
#ifdef WNT #ifdef _WIN32
#include <OSD_Exception.hxx> #include <OSD_Exception.hxx>
#else #else
#include <OSD_Signal.hxx> #include <OSD_Signal.hxx>
@ -385,7 +385,7 @@ void Interface_FileReaderTool::LoadModel
num0 = thereader->FindNextRecord(num); //:g9 abv 28 May 98: tr8_as2_ug.stp - infinite cycle: (0); num0 = thereader->FindNextRecord(num); //:g9 abv 28 May 98: tr8_as2_ug.stp - infinite cycle: (0);
Handle(Standard_Failure) afail = Standard_Failure::Caught(); Handle(Standard_Failure) afail = Standard_Failure::Caught();
#ifdef WNT #ifdef _WIN32
if (afail.IsNull() || afail->IsKind(STANDARD_TYPE(OSD_Exception))) ierr = 2; if (afail.IsNull() || afail->IsKind(STANDARD_TYPE(OSD_Exception))) ierr = 2;
#else #else
if (afail.IsNull() || afail->IsKind(STANDARD_TYPE(OSD_Signal))) ierr = 2; if (afail.IsNull() || afail->IsKind(STANDARD_TYPE(OSD_Signal))) ierr = 2;

2
src/LDOM/LDOMBasicString.cxx
View File

@ -317,7 +317,7 @@ Standard_Boolean LDOMBasicString::GetInteger (Standard_Integer& aResult) const
} }
#ifdef OCCT_DEBUG #ifdef OCCT_DEBUG
#ifndef WNT #ifndef _MSC_VER
//======================================================================= //=======================================================================
// Debug Function for DBX: use "print -p <Variable> or pp <Variable>" // Debug Function for DBX: use "print -p <Variable> or pp <Variable>"
//======================================================================= //=======================================================================

4
src/LDOM/LDOMParser.cxx
View File

@ -26,7 +26,7 @@
#include <TCollection_ExtendedString.hxx> #include <TCollection_ExtendedString.hxx>
#include <fcntl.h> #include <fcntl.h>
#ifdef WNT #ifdef _MSC_VER
#include <io.h> #include <io.h>
#else #else
#include <unistd.h> #include <unistd.h>
@ -63,7 +63,7 @@ inline
#ifdef LDOM_PARSER_TRACE #ifdef LDOM_PARSER_TRACE
static FILE * ff = NULL; static FILE * ff = NULL;
TCollection_AsciiString aTraceFileName; TCollection_AsciiString aTraceFileName;
#ifdef WNT #ifdef _WIN32
aTraceFileName = TCollection_AsciiString (getenv("TEMP")) + "\\ldom.trace"; aTraceFileName = TCollection_AsciiString (getenv("TEMP")) + "\\ldom.trace";
#else #else
aTraceFileName = "/tmp/ldom.trace"; aTraceFileName = "/tmp/ldom.trace";

2
src/LDOM/LDOM_BasicNode.cxx
View File

@ -45,7 +45,7 @@ const LDOM_BasicNode * LDOM_BasicNode::GetSibling () const
} }
#ifdef OCCT_DEBUG #ifdef OCCT_DEBUG
#ifndef WNT #ifndef _MSC_VER
//======================================================================= //=======================================================================
// Debug Function for DBX: use "print -p <Variable> or pp <Variable>" // Debug Function for DBX: use "print -p <Variable> or pp <Variable>"
//======================================================================= //=======================================================================

2
src/LDOM/LDOM_XmlReader.cxx
View File

@ -25,7 +25,7 @@
#include <string.h> #include <string.h>
#include <errno.h> #include <errno.h>
#ifdef WNT #ifdef _MSC_VER
#include <io.h> #include <io.h>
#else #else
#include <unistd.h> #include <unistd.h>

2
src/LDOM/LDOM_XmlWriter.cxx
View File

@ -409,7 +409,7 @@ LDOM_XmlWriter& LDOM_XmlWriter::operator<< (const LDOM_Node& theNodeToWrite)
break; break;
} }
default: default:
#ifndef WNT #ifndef _MSC_VER
cerr << "Unrecognized node type = " cerr << "Unrecognized node type = "
<< (long)theNodeToWrite.getNodeType() << endl << (long)theNodeToWrite.getNodeType() << endl
#endif #endif

17
src/MAT2d/MAT2d_MapBiIntHasher.lxx
View File

@ -21,36 +21,19 @@
//function : HashCode //function : HashCode
//purpose : //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 inline Standard_Integer MAT2d_MapBiIntHasher::HashCode
(const MAT2d_BiInt& Key1, const Standard_Integer upper) (const MAT2d_BiInt& Key1, const Standard_Integer upper)
{ {
return TColStd_MapIntegerHasher::HashCode(Key1.FirstIndex(),upper); return TColStd_MapIntegerHasher::HashCode(Key1.FirstIndex(),upper);
} }
//#endif
//======================================================================= //=======================================================================
//function : IsEqual //function : IsEqual
//purpose : //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 inline Standard_Boolean MAT2d_MapBiIntHasher::IsEqual
(const MAT2d_BiInt& Key1, (const MAT2d_BiInt& Key1,
const MAT2d_BiInt& Key2) const MAT2d_BiInt& Key2)
{ {
return (Key1 == Key2); return (Key1 == Key2);
} }
//#endif

2
src/MeshTest/MeshTest.cxx
View File

@ -84,7 +84,7 @@
#include <stdio.h> #include <stdio.h>
//epa Memory leaks test //epa Memory leaks test
//OAN: for triepoints //OAN: for triepoints
#ifdef WNT #ifdef _WIN32
Standard_IMPORT Draw_Viewer dout; Standard_IMPORT Draw_Viewer dout;
#endif #endif

2
src/MeshVS/MeshVS_TextPrsBuilder.cxx
View File

@ -161,7 +161,7 @@ void MeshVS_TextPrsBuilder::Build ( const Handle(Prs3d_Presentation)& Prs,
Handle (Graphic3d_Group) aTextGroup = Prs3d_Root::CurrentGroup ( Prs ); Handle (Graphic3d_Group) aTextGroup = Prs3d_Root::CurrentGroup ( Prs );
Quantity_Color AColor = Quantity_NOC_YELLOW; Quantity_Color AColor = Quantity_NOC_YELLOW;
#ifdef WNT #ifdef _WIN32
Standard_CString AFont = "Courier New"; Standard_CString AFont = "Courier New";
#else #else
Standard_CString AFont = "Courier"; Standard_CString AFont = "Courier";

2
src/Message/Message_MsgFile.cxx
View File

@ -63,7 +63,7 @@ Standard_Boolean Message_MsgFile::Load (const Standard_CString theDirName,
{ {
TCollection_AsciiString aFileName = aDirList.Token (" \t\n", i); TCollection_AsciiString aFileName = aDirList.Token (" \t\n", i);
if (aFileName.IsEmpty()) break; if (aFileName.IsEmpty()) break;
#ifdef WNT #ifdef _WIN32
aFileName += '\\'; aFileName += '\\';
#else #else
aFileName += '/'; aFileName += '/';

4
src/OSD/OSD.cxx
View File

@ -68,7 +68,7 @@ Standard_Boolean OSD::CStringToReal(const Standard_CString aString,
//purpose : Cause the process to sleep during a amount of seconds //purpose : Cause the process to sleep during a amount of seconds
//======================================================================= //=======================================================================
#ifdef WNT #ifdef _WIN32
# include <Windows.h> # include <Windows.h>
#if !defined(__CYGWIN32__) && !defined(__MINGW32__) #if !defined(__CYGWIN32__) && !defined(__MINGW32__)
//# include <Mapiwin.h> //# include <Mapiwin.h>
@ -214,7 +214,7 @@ Standard_Integer OSD::AvailableMemory()
# define SIZE_MAX 0x7fffffff # define SIZE_MAX 0x7fffffff
# elif defined(__osf__) || defined(DECOSF1) # elif defined(__osf__) || defined(DECOSF1)
# define SIZE_MAX 0x10000000000 # define SIZE_MAX 0x10000000000
# elif defined(WNT) # elif defined(_WIN32)
# define SIZE_MAX 0x7ffdefff # define SIZE_MAX 0x7ffdefff
# else # else
# define SIZE_MAX 0xffffffff # define SIZE_MAX 0xffffffff

Some files were not shown because too many files have changed in this diff Show More