You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xalan.apache.org by db...@apache.org on 2007/12/13 02:25:56 UTC
svn commit: r603798 [8/9] - in /xalan/c/branches/dbertoni/VisualStudioFixup:
./ Projects/Win32/VC6/AllInOne/ Projects/Win32/VC6/ApacheModuleXSLT/
Projects/Win32/VC6/CompileStylesheet/ Projects/Win32/VC6/DocumentBuilder/
Projects/Win32/VC6/ExternalFunct...
Modified: xalan/c/branches/dbertoni/VisualStudioFixup/samples/Projects/Win32/VC6/XPathWrapper/XPathWrapper.dsp
URL: http://svn.apache.org/viewvc/xalan/c/branches/dbertoni/VisualStudioFixup/samples/Projects/Win32/VC6/XPathWrapper/XPathWrapper.dsp?rev=603798&r1=603797&r2=603798&view=diff
==============================================================================
--- xalan/c/branches/dbertoni/VisualStudioFixup/samples/Projects/Win32/VC6/XPathWrapper/XPathWrapper.dsp (original)
+++ xalan/c/branches/dbertoni/VisualStudioFixup/samples/Projects/Win32/VC6/XPathWrapper/XPathWrapper.dsp Wed Dec 12 17:25:38 2007
@@ -44,8 +44,8 @@
# PROP Intermediate_Dir "..\..\..\..\..\bin\XPathWrapper"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W4 /GR /GX /O2 /Ob2 /I "..\..\..\..\..\include\xalanc" /I "..\..\..\..\..\include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "NDEBUG" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MD /W4 /GR /GX /O2 /Ob2 /I "..\..\..\..\..\include\xalanc" /I "..\..\..\..\..\include" /D "NDEBUG" /D "_MBCS" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -69,8 +69,8 @@
# PROP Intermediate_Dir "..\..\..\..\..\bin\XPathWrapper"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W4 /Gm /GR /GX /Zi /Od /I "..\..\..\..\..\include\xalanc" /I "..\..\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W4 /Gm /GR /GX /Zi /Od /I "..\..\..\..\..\include\xalanc" /I "..\..\..\..\..\include" /D "_MBCS" /YX /FD /GZ /c
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
@@ -93,8 +93,8 @@
# PROP Intermediate_Dir "..\..\..\..\..\bin\XPathWrapper"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /D "WIN64" /nologo /MD /W4 /GR /GX /O2 /Ob2 /I "..\..\..\..\..\include\xalanc" /I "..\..\..\..\..\include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "NDEBUG" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MD /W4 /GR /GX /O2 /Ob2 /I "..\..\..\..\..\include\xalanc" /I "..\..\..\..\..\include" /D "NDEBUG" /D "_MBCS" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -118,8 +118,8 @@
# PROP Intermediate_Dir "..\..\..\..\..\bin\XPathWrapper"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /D "WIN64" /nologo /MDd /W4 /Gm /GR /GX /Zi /Od /I "..\..\..\..\..\include\xalanc" /I "..\..\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W4 /Gm /GR /GX /Zi /Od /I "..\..\..\..\..\include\xalanc" /I "..\..\..\..\..\include" /D "_MBCS" /YX /FD /GZ /c
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
Modified: xalan/c/branches/dbertoni/VisualStudioFixup/samples/Projects/Win32/VC6/XalanTransform/XalanTransform.dsp
URL: http://svn.apache.org/viewvc/xalan/c/branches/dbertoni/VisualStudioFixup/samples/Projects/Win32/VC6/XalanTransform/XalanTransform.dsp?rev=603798&r1=603797&r2=603798&view=diff
==============================================================================
--- xalan/c/branches/dbertoni/VisualStudioFixup/samples/Projects/Win32/VC6/XalanTransform/XalanTransform.dsp (original)
+++ xalan/c/branches/dbertoni/VisualStudioFixup/samples/Projects/Win32/VC6/XalanTransform/XalanTransform.dsp Wed Dec 12 17:25:38 2007
@@ -44,8 +44,8 @@
# PROP Intermediate_Dir "..\..\..\..\..\bin\XalanTransform"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W4 /GR /GX /O2 /Ob2 /I "..\..\..\..\..\include\xalanc" /I "..\..\..\..\..\include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "NDEBUG" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MD /W4 /GR /GX /O2 /Ob2 /I "..\..\..\..\..\include\xalanc" /I "..\..\..\..\..\include" /D "NDEBUG" /D "_MBCS" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -69,8 +69,8 @@
# PROP Intermediate_Dir "..\..\..\..\..\bin\XalanTransform"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W4 /Gm /GR /GX /Zi /Od /I "..\..\..\..\..\include\xalanc" /I "..\..\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W4 /Gm /GR /GX /Zi /Od /I "..\..\..\..\..\include\xalanc" /I "..\..\..\..\..\include" /D "_MBCS" /YX /FD /GZ /c
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
@@ -93,8 +93,8 @@
# PROP Intermediate_Dir "..\..\..\..\..\bin\XalanTransform"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /D "WIN64" /nologo /MD /W4 /GR /GX /O2 /Ob2 /I "..\..\..\..\..\include\xalanc" /I "..\..\..\..\..\include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "NDEBUG" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MD /W4 /GR /GX /O2 /Ob2 /I "..\..\..\..\..\include\xalanc" /I "..\..\..\..\..\include" /D "NDEBUG" /D "_MBCS" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -118,8 +118,8 @@
# PROP Intermediate_Dir "..\..\..\..\..\bin\XalanTransform"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /D "WIN64" /nologo /MDd /W4 /Gm /GR /GX /Zi /Od /I "..\..\..\..\..\include\xalanc" /I "..\..\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W4 /Gm /GR /GX /Zi /Od /I "..\..\..\..\..\include\xalanc" /I "..\..\..\..\..\include" /D "_MBCS" /YX /FD /GZ /c
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
Modified: xalan/c/branches/dbertoni/VisualStudioFixup/samples/Projects/Win32/VC6/XalanTransformerCallback/XalanTransformerCallback.dsp
URL: http://svn.apache.org/viewvc/xalan/c/branches/dbertoni/VisualStudioFixup/samples/Projects/Win32/VC6/XalanTransformerCallback/XalanTransformerCallback.dsp?rev=603798&r1=603797&r2=603798&view=diff
==============================================================================
--- xalan/c/branches/dbertoni/VisualStudioFixup/samples/Projects/Win32/VC6/XalanTransformerCallback/XalanTransformerCallback.dsp (original)
+++ xalan/c/branches/dbertoni/VisualStudioFixup/samples/Projects/Win32/VC6/XalanTransformerCallback/XalanTransformerCallback.dsp Wed Dec 12 17:25:38 2007
@@ -44,8 +44,8 @@
# PROP Intermediate_Dir "..\..\..\..\..\bin\XalanTransformerCallback"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W4 /GR /GX /O2 /Ob2 /I "..\..\..\..\..\include\xalanc" /I "..\..\..\..\..\include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "NDEBUG" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MD /W4 /GR /GX /O2 /Ob2 /I "..\..\..\..\..\include\xalanc" /I "..\..\..\..\..\include" /D "NDEBUG" /D "_MBCS" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -69,8 +69,8 @@
# PROP Intermediate_Dir "..\..\..\..\..\bin\XalanTransformerCallback"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W4 /Gm /GR /GX /Zi /Od /I "..\..\..\..\..\include\xalanc" /I "..\..\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W4 /Gm /GR /GX /Zi /Od /I "..\..\..\..\..\include\xalanc" /I "..\..\..\..\..\include" /D "_MBCS" /YX /FD /GZ /c
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
@@ -93,8 +93,8 @@
# PROP Intermediate_Dir "..\..\..\..\..\bin\XalanTransformerCallback"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /D "WIN64" /nologo /MD /W4 /GR /GX /O2 /Ob2 /I "..\..\..\..\..\include\xalanc" /I "..\..\..\..\..\include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "NDEBUG" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MD /W4 /GR /GX /O2 /Ob2 /I "..\..\..\..\..\include\xalanc" /I "..\..\..\..\..\include" /D "NDEBUG" /D "_MBCS" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -118,8 +118,8 @@
# PROP Intermediate_Dir "..\..\..\..\..\bin\XalanTransformerCallback"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /D "WIN64" /nologo /MDd /W4 /Gm /GR /GX /Zi /Od /I "..\..\..\..\..\include\xalanc" /I "..\..\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W4 /Gm /GR /GX /Zi /Od /I "..\..\..\..\..\include\xalanc" /I "..\..\..\..\..\include" /D "_MBCS" /YX /FD /GZ /c
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
Modified: xalan/c/branches/dbertoni/VisualStudioFixup/samples/Projects/Win32/VC7.1/ApacheModuleXSLT/ApacheModuleXSLT.vcproj
URL: http://svn.apache.org/viewvc/xalan/c/branches/dbertoni/VisualStudioFixup/samples/Projects/Win32/VC7.1/ApacheModuleXSLT/ApacheModuleXSLT.vcproj?rev=603798&r1=603797&r2=603798&view=diff
==============================================================================
--- xalan/c/branches/dbertoni/VisualStudioFixup/samples/Projects/Win32/VC7.1/ApacheModuleXSLT/ApacheModuleXSLT.vcproj (original)
+++ xalan/c/branches/dbertoni/VisualStudioFixup/samples/Projects/Win32/VC7.1/ApacheModuleXSLT/ApacheModuleXSLT.vcproj Wed Dec 12 17:25:38 2007
@@ -22,7 +22,7 @@
Name="VCCLCompilerTool"
InlineFunctionExpansion="2"
AdditionalIncludeDirectories="..\..\..\..\..\include\xalanc,..\..\..\..\..\include,\Apache Group\Apache\include"
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;APACHEMODULEXSLT_EXPORTS"
+ PreprocessorDefinitions="NDEBUG;APACHEMODULEXSLT_EXPORTS"
StringPooling="TRUE"
RuntimeLibrary="2"
EnableFunctionLevelLinking="TRUE"
@@ -84,7 +84,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="\Apache Group\Apache\include,..\..\..\..\..\include\xalanc,..\..\..\..\..\include"
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;APACHEMODULEXSLT_EXPORTS"
+ PreprocessorDefinitions="APACHEMODULEXSLT_EXPORTS"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
RuntimeTypeInfo="TRUE"
Modified: xalan/c/branches/dbertoni/VisualStudioFixup/samples/Projects/Win32/VC7.1/CompileStylesheet/CompileStylesheet.vcproj
URL: http://svn.apache.org/viewvc/xalan/c/branches/dbertoni/VisualStudioFixup/samples/Projects/Win32/VC7.1/CompileStylesheet/CompileStylesheet.vcproj?rev=603798&r1=603797&r2=603798&view=diff
==============================================================================
--- xalan/c/branches/dbertoni/VisualStudioFixup/samples/Projects/Win32/VC7.1/CompileStylesheet/CompileStylesheet.vcproj (original)
+++ xalan/c/branches/dbertoni/VisualStudioFixup/samples/Projects/Win32/VC7.1/CompileStylesheet/CompileStylesheet.vcproj Wed Dec 12 17:25:38 2007
@@ -22,7 +22,7 @@
Name="VCCLCompilerTool"
InlineFunctionExpansion="2"
AdditionalIncludeDirectories="..\..\..\..\..\include\xalanc,..\..\..\..\..\include"
- PreprocessorDefinitions="WIN32,NDEBUG,_CONSOLE"
+ PreprocessorDefinitions="NDEBUG"
StringPooling="TRUE"
RuntimeLibrary="2"
EnableFunctionLevelLinking="TRUE"
@@ -82,7 +82,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\..\..\..\include\xalanc,..\..\..\..\..\include"
- PreprocessorDefinitions="WIN32,_DEBUG,_CONSOLE"
+ PreprocessorDefinitions=""
BasicRuntimeChecks="3"
RuntimeLibrary="3"
RuntimeTypeInfo="TRUE"
Modified: xalan/c/branches/dbertoni/VisualStudioFixup/samples/Projects/Win32/VC7.1/DocumentBuilder/DocumentBuilder.vcproj
URL: http://svn.apache.org/viewvc/xalan/c/branches/dbertoni/VisualStudioFixup/samples/Projects/Win32/VC7.1/DocumentBuilder/DocumentBuilder.vcproj?rev=603798&r1=603797&r2=603798&view=diff
==============================================================================
--- xalan/c/branches/dbertoni/VisualStudioFixup/samples/Projects/Win32/VC7.1/DocumentBuilder/DocumentBuilder.vcproj (original)
+++ xalan/c/branches/dbertoni/VisualStudioFixup/samples/Projects/Win32/VC7.1/DocumentBuilder/DocumentBuilder.vcproj Wed Dec 12 17:25:38 2007
@@ -22,7 +22,7 @@
Name="VCCLCompilerTool"
InlineFunctionExpansion="2"
AdditionalIncludeDirectories="..\..\..\..\..\include\xalanc,..\..\..\..\..\include"
- PreprocessorDefinitions="WIN32,NDEBUG,_CONSOLE"
+ PreprocessorDefinitions="NDEBUG"
StringPooling="TRUE"
RuntimeLibrary="2"
EnableFunctionLevelLinking="TRUE"
@@ -82,7 +82,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\..\..\..\include\xalanc,..\..\..\..\..\include"
- PreprocessorDefinitions="WIN32,_DEBUG,_CONSOLE"
+ PreprocessorDefinitions=""
BasicRuntimeChecks="3"
RuntimeLibrary="3"
RuntimeTypeInfo="TRUE"
Modified: xalan/c/branches/dbertoni/VisualStudioFixup/samples/Projects/Win32/VC7.1/ExternalFunction/ExternalFunction.vcproj
URL: http://svn.apache.org/viewvc/xalan/c/branches/dbertoni/VisualStudioFixup/samples/Projects/Win32/VC7.1/ExternalFunction/ExternalFunction.vcproj?rev=603798&r1=603797&r2=603798&view=diff
==============================================================================
--- xalan/c/branches/dbertoni/VisualStudioFixup/samples/Projects/Win32/VC7.1/ExternalFunction/ExternalFunction.vcproj (original)
+++ xalan/c/branches/dbertoni/VisualStudioFixup/samples/Projects/Win32/VC7.1/ExternalFunction/ExternalFunction.vcproj Wed Dec 12 17:25:38 2007
@@ -22,7 +22,7 @@
Name="VCCLCompilerTool"
InlineFunctionExpansion="2"
AdditionalIncludeDirectories="..\..\..\..\..\include\xalanc,..\..\..\..\..\include"
- PreprocessorDefinitions="WIN32,NDEBUG,_CONSOLE"
+ PreprocessorDefinitions="NDEBUG"
StringPooling="TRUE"
RuntimeLibrary="2"
EnableFunctionLevelLinking="TRUE"
@@ -82,7 +82,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\..\..\..\include\xalanc,..\..\..\..\..\include"
- PreprocessorDefinitions="WIN32,_DEBUG,_CONSOLE"
+ PreprocessorDefinitions=""
BasicRuntimeChecks="3"
RuntimeLibrary="3"
RuntimeTypeInfo="TRUE"
Modified: xalan/c/branches/dbertoni/VisualStudioFixup/samples/Projects/Win32/VC7.1/ParsedSourceWrappers/ParsedSourceWrappers.vcproj
URL: http://svn.apache.org/viewvc/xalan/c/branches/dbertoni/VisualStudioFixup/samples/Projects/Win32/VC7.1/ParsedSourceWrappers/ParsedSourceWrappers.vcproj?rev=603798&r1=603797&r2=603798&view=diff
==============================================================================
--- xalan/c/branches/dbertoni/VisualStudioFixup/samples/Projects/Win32/VC7.1/ParsedSourceWrappers/ParsedSourceWrappers.vcproj (original)
+++ xalan/c/branches/dbertoni/VisualStudioFixup/samples/Projects/Win32/VC7.1/ParsedSourceWrappers/ParsedSourceWrappers.vcproj Wed Dec 12 17:25:38 2007
@@ -22,7 +22,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\..\..\..\include\xalanc,..\..\..\..\..\include"
- PreprocessorDefinitions="WIN32,_DEBUG,_CONSOLE"
+ PreprocessorDefinitions=""
BasicRuntimeChecks="3"
RuntimeLibrary="3"
RuntimeTypeInfo="TRUE"
@@ -84,7 +84,7 @@
Name="VCCLCompilerTool"
InlineFunctionExpansion="2"
AdditionalIncludeDirectories="..\..\..\..\..\include\xalanc,..\..\..\..\..\include"
- PreprocessorDefinitions="WIN32,NDEBUG,_CONSOLE"
+ PreprocessorDefinitions="NDEBUG"
StringPooling="TRUE"
RuntimeLibrary="2"
EnableFunctionLevelLinking="TRUE"
Modified: xalan/c/branches/dbertoni/VisualStudioFixup/samples/Projects/Win32/VC7.1/SerializeNodeSet/SerializeNodeSet.vcproj
URL: http://svn.apache.org/viewvc/xalan/c/branches/dbertoni/VisualStudioFixup/samples/Projects/Win32/VC7.1/SerializeNodeSet/SerializeNodeSet.vcproj?rev=603798&r1=603797&r2=603798&view=diff
==============================================================================
--- xalan/c/branches/dbertoni/VisualStudioFixup/samples/Projects/Win32/VC7.1/SerializeNodeSet/SerializeNodeSet.vcproj (original)
+++ xalan/c/branches/dbertoni/VisualStudioFixup/samples/Projects/Win32/VC7.1/SerializeNodeSet/SerializeNodeSet.vcproj Wed Dec 12 17:25:38 2007
@@ -22,7 +22,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\..\..\..\include\xalanc,..\..\..\..\..\include"
- PreprocessorDefinitions="WIN32,_DEBUG,_CONSOLE"
+ PreprocessorDefinitions=""
BasicRuntimeChecks="3"
RuntimeLibrary="3"
RuntimeTypeInfo="TRUE"
@@ -84,7 +84,7 @@
Name="VCCLCompilerTool"
InlineFunctionExpansion="2"
AdditionalIncludeDirectories="..\..\..\..\..\include\xalanc,..\..\..\..\..\include"
- PreprocessorDefinitions="WIN32,NDEBUG,_CONSOLE"
+ PreprocessorDefinitions="NDEBUG"
StringPooling="TRUE"
RuntimeLibrary="2"
EnableFunctionLevelLinking="TRUE"
Modified: xalan/c/branches/dbertoni/VisualStudioFixup/samples/Projects/Win32/VC7.1/SimpleTransform/SimpleTransform.vcproj
URL: http://svn.apache.org/viewvc/xalan/c/branches/dbertoni/VisualStudioFixup/samples/Projects/Win32/VC7.1/SimpleTransform/SimpleTransform.vcproj?rev=603798&r1=603797&r2=603798&view=diff
==============================================================================
--- xalan/c/branches/dbertoni/VisualStudioFixup/samples/Projects/Win32/VC7.1/SimpleTransform/SimpleTransform.vcproj (original)
+++ xalan/c/branches/dbertoni/VisualStudioFixup/samples/Projects/Win32/VC7.1/SimpleTransform/SimpleTransform.vcproj Wed Dec 12 17:25:38 2007
@@ -22,7 +22,7 @@
Name="VCCLCompilerTool"
InlineFunctionExpansion="2"
AdditionalIncludeDirectories="..\..\..\..\..\include\xalanc,..\..\..\..\..\include"
- PreprocessorDefinitions="WIN32,NDEBUG,_CONSOLE"
+ PreprocessorDefinitions="NDEBUG"
StringPooling="TRUE"
RuntimeLibrary="2"
EnableFunctionLevelLinking="TRUE"
@@ -82,7 +82,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\..\..\..\include\xalanc,..\..\..\..\..\include"
- PreprocessorDefinitions="WIN32,_DEBUG,_CONSOLE"
+ PreprocessorDefinitions=""
BasicRuntimeChecks="3"
RuntimeLibrary="3"
RuntimeTypeInfo="TRUE"
Modified: xalan/c/branches/dbertoni/VisualStudioFixup/samples/Projects/Win32/VC7.1/SimpleXPathAPI/SimpleXPathAPI.vcproj
URL: http://svn.apache.org/viewvc/xalan/c/branches/dbertoni/VisualStudioFixup/samples/Projects/Win32/VC7.1/SimpleXPathAPI/SimpleXPathAPI.vcproj?rev=603798&r1=603797&r2=603798&view=diff
==============================================================================
--- xalan/c/branches/dbertoni/VisualStudioFixup/samples/Projects/Win32/VC7.1/SimpleXPathAPI/SimpleXPathAPI.vcproj (original)
+++ xalan/c/branches/dbertoni/VisualStudioFixup/samples/Projects/Win32/VC7.1/SimpleXPathAPI/SimpleXPathAPI.vcproj Wed Dec 12 17:25:38 2007
@@ -22,7 +22,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\..\..\..\include\xalanc,..\..\..\..\..\include"
- PreprocessorDefinitions="WIN32,_DEBUG,_CONSOLE"
+ PreprocessorDefinitions=""
BasicRuntimeChecks="3"
RuntimeLibrary="3"
RuntimeTypeInfo="TRUE"
@@ -84,7 +84,7 @@
Name="VCCLCompilerTool"
InlineFunctionExpansion="2"
AdditionalIncludeDirectories="..\..\..\..\..\include\xalanc,..\..\..\..\..\include"
- PreprocessorDefinitions="WIN32,NDEBUG,_CONSOLE"
+ PreprocessorDefinitions="NDEBUG"
StringPooling="TRUE"
RuntimeLibrary="2"
EnableFunctionLevelLinking="TRUE"
Modified: xalan/c/branches/dbertoni/VisualStudioFixup/samples/Projects/Win32/VC7.1/SimpleXPathCAPI/SimpleXPathCAPI.vcproj
URL: http://svn.apache.org/viewvc/xalan/c/branches/dbertoni/VisualStudioFixup/samples/Projects/Win32/VC7.1/SimpleXPathCAPI/SimpleXPathCAPI.vcproj?rev=603798&r1=603797&r2=603798&view=diff
==============================================================================
--- xalan/c/branches/dbertoni/VisualStudioFixup/samples/Projects/Win32/VC7.1/SimpleXPathCAPI/SimpleXPathCAPI.vcproj (original)
+++ xalan/c/branches/dbertoni/VisualStudioFixup/samples/Projects/Win32/VC7.1/SimpleXPathCAPI/SimpleXPathCAPI.vcproj Wed Dec 12 17:25:38 2007
@@ -22,7 +22,7 @@
Name="VCCLCompilerTool"
InlineFunctionExpansion="2"
AdditionalIncludeDirectories="..\..\..\..\..\include\xalanc,..\..\..\..\..\include"
- PreprocessorDefinitions="WIN32,NDEBUG,_CONSOLE"
+ PreprocessorDefinitions="NDEBUG"
StringPooling="TRUE"
RuntimeLibrary="2"
EnableFunctionLevelLinking="TRUE"
@@ -82,7 +82,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\..\..\..\include\xalanc,..\..\..\..\..\include"
- PreprocessorDefinitions="WIN32,_DEBUG,_CONSOLE"
+ PreprocessorDefinitions=""
BasicRuntimeChecks="3"
RuntimeLibrary="3"
RuntimeTypeInfo="TRUE"
Modified: xalan/c/branches/dbertoni/VisualStudioFixup/samples/Projects/Win32/VC7.1/StreamTransform/StreamTransform.vcproj
URL: http://svn.apache.org/viewvc/xalan/c/branches/dbertoni/VisualStudioFixup/samples/Projects/Win32/VC7.1/StreamTransform/StreamTransform.vcproj?rev=603798&r1=603797&r2=603798&view=diff
==============================================================================
--- xalan/c/branches/dbertoni/VisualStudioFixup/samples/Projects/Win32/VC7.1/StreamTransform/StreamTransform.vcproj (original)
+++ xalan/c/branches/dbertoni/VisualStudioFixup/samples/Projects/Win32/VC7.1/StreamTransform/StreamTransform.vcproj Wed Dec 12 17:25:38 2007
@@ -22,7 +22,7 @@
Name="VCCLCompilerTool"
InlineFunctionExpansion="2"
AdditionalIncludeDirectories="..\..\..\..\..\include\xalanc,..\..\..\..\..\include"
- PreprocessorDefinitions="WIN32,NDEBUG,_CONSOLE"
+ PreprocessorDefinitions="NDEBUG"
StringPooling="TRUE"
RuntimeLibrary="2"
EnableFunctionLevelLinking="TRUE"
@@ -82,7 +82,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\..\..\..\include\xalanc,..\..\..\..\..\include"
- PreprocessorDefinitions="WIN32,_DEBUG,_CONSOLE"
+ PreprocessorDefinitions=""
BasicRuntimeChecks="3"
RuntimeLibrary="3"
RuntimeTypeInfo="TRUE"
Modified: xalan/c/branches/dbertoni/VisualStudioFixup/samples/Projects/Win32/VC7.1/ThreadSafe/ThreadSafe.vcproj
URL: http://svn.apache.org/viewvc/xalan/c/branches/dbertoni/VisualStudioFixup/samples/Projects/Win32/VC7.1/ThreadSafe/ThreadSafe.vcproj?rev=603798&r1=603797&r2=603798&view=diff
==============================================================================
--- xalan/c/branches/dbertoni/VisualStudioFixup/samples/Projects/Win32/VC7.1/ThreadSafe/ThreadSafe.vcproj (original)
+++ xalan/c/branches/dbertoni/VisualStudioFixup/samples/Projects/Win32/VC7.1/ThreadSafe/ThreadSafe.vcproj Wed Dec 12 17:25:38 2007
@@ -22,7 +22,7 @@
Name="VCCLCompilerTool"
InlineFunctionExpansion="2"
AdditionalIncludeDirectories="..\..\..\..\..\include\xalanc,..\..\..\..\..\include"
- PreprocessorDefinitions="WIN32,NDEBUG,_CONSOLE"
+ PreprocessorDefinitions="NDEBUG"
StringPooling="TRUE"
RuntimeLibrary="2"
EnableFunctionLevelLinking="TRUE"
@@ -82,7 +82,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\..\..\..\include\xalanc,..\..\..\..\..\include"
- PreprocessorDefinitions="WIN32,_DEBUG,_CONSOLE"
+ PreprocessorDefinitions=""
BasicRuntimeChecks="3"
RuntimeLibrary="3"
RuntimeTypeInfo="TRUE"
Modified: xalan/c/branches/dbertoni/VisualStudioFixup/samples/Projects/Win32/VC7.1/TraceListen/TraceListen.vcproj
URL: http://svn.apache.org/viewvc/xalan/c/branches/dbertoni/VisualStudioFixup/samples/Projects/Win32/VC7.1/TraceListen/TraceListen.vcproj?rev=603798&r1=603797&r2=603798&view=diff
==============================================================================
--- xalan/c/branches/dbertoni/VisualStudioFixup/samples/Projects/Win32/VC7.1/TraceListen/TraceListen.vcproj (original)
+++ xalan/c/branches/dbertoni/VisualStudioFixup/samples/Projects/Win32/VC7.1/TraceListen/TraceListen.vcproj Wed Dec 12 17:25:38 2007
@@ -22,7 +22,7 @@
Name="VCCLCompilerTool"
InlineFunctionExpansion="2"
AdditionalIncludeDirectories="..\..\..\..\..\include\xalanc,..\..\..\..\..\include"
- PreprocessorDefinitions="WIN32,NDEBUG,_CONSOLE"
+ PreprocessorDefinitions="NDEBUG"
StringPooling="TRUE"
RuntimeLibrary="2"
EnableFunctionLevelLinking="TRUE"
@@ -82,7 +82,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\..\..\..\include\xalanc,..\..\..\..\..\include"
- PreprocessorDefinitions="WIN32,_DEBUG,_CONSOLE"
+ PreprocessorDefinitions=""
BasicRuntimeChecks="3"
RuntimeLibrary="3"
RuntimeTypeInfo="TRUE"
Modified: xalan/c/branches/dbertoni/VisualStudioFixup/samples/Projects/Win32/VC7.1/TransformToXercesDOM/TransformToXercesDOM.vcproj
URL: http://svn.apache.org/viewvc/xalan/c/branches/dbertoni/VisualStudioFixup/samples/Projects/Win32/VC7.1/TransformToXercesDOM/TransformToXercesDOM.vcproj?rev=603798&r1=603797&r2=603798&view=diff
==============================================================================
--- xalan/c/branches/dbertoni/VisualStudioFixup/samples/Projects/Win32/VC7.1/TransformToXercesDOM/TransformToXercesDOM.vcproj (original)
+++ xalan/c/branches/dbertoni/VisualStudioFixup/samples/Projects/Win32/VC7.1/TransformToXercesDOM/TransformToXercesDOM.vcproj Wed Dec 12 17:25:38 2007
@@ -22,7 +22,7 @@
Name="VCCLCompilerTool"
InlineFunctionExpansion="2"
AdditionalIncludeDirectories="..\..\..\..\..\include\xalanc,..\..\..\..\..\include"
- PreprocessorDefinitions="WIN32,NDEBUG,_CONSOLE"
+ PreprocessorDefinitions="NDEBUG"
StringPooling="TRUE"
RuntimeLibrary="2"
EnableFunctionLevelLinking="TRUE"
@@ -82,7 +82,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\..\..\..\include\xalanc,..\..\..\..\..\include"
- PreprocessorDefinitions="WIN32,_DEBUG,_CONSOLE"
+ PreprocessorDefinitions=""
BasicRuntimeChecks="3"
RuntimeLibrary="3"
RuntimeTypeInfo="TRUE"
Modified: xalan/c/branches/dbertoni/VisualStudioFixup/samples/Projects/Win32/VC7.1/UseStylesheetParam/UseStylesheetParam.vcproj
URL: http://svn.apache.org/viewvc/xalan/c/branches/dbertoni/VisualStudioFixup/samples/Projects/Win32/VC7.1/UseStylesheetParam/UseStylesheetParam.vcproj?rev=603798&r1=603797&r2=603798&view=diff
==============================================================================
--- xalan/c/branches/dbertoni/VisualStudioFixup/samples/Projects/Win32/VC7.1/UseStylesheetParam/UseStylesheetParam.vcproj (original)
+++ xalan/c/branches/dbertoni/VisualStudioFixup/samples/Projects/Win32/VC7.1/UseStylesheetParam/UseStylesheetParam.vcproj Wed Dec 12 17:25:38 2007
@@ -22,7 +22,7 @@
Name="VCCLCompilerTool"
InlineFunctionExpansion="2"
AdditionalIncludeDirectories="..\..\..\..\..\include\xalanc,..\..\..\..\..\include"
- PreprocessorDefinitions="WIN32,NDEBUG,_CONSOLE"
+ PreprocessorDefinitions="NDEBUG"
StringPooling="TRUE"
RuntimeLibrary="2"
EnableFunctionLevelLinking="TRUE"
@@ -82,7 +82,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\..\..\..\include\xalanc,..\..\..\..\..\include"
- PreprocessorDefinitions="WIN32,_DEBUG,_CONSOLE"
+ PreprocessorDefinitions=""
BasicRuntimeChecks="3"
RuntimeLibrary="3"
RuntimeTypeInfo="TRUE"
Modified: xalan/c/branches/dbertoni/VisualStudioFixup/samples/Projects/Win32/VC7.1/XPathWrapper/XPathWrapper.vcproj
URL: http://svn.apache.org/viewvc/xalan/c/branches/dbertoni/VisualStudioFixup/samples/Projects/Win32/VC7.1/XPathWrapper/XPathWrapper.vcproj?rev=603798&r1=603797&r2=603798&view=diff
==============================================================================
--- xalan/c/branches/dbertoni/VisualStudioFixup/samples/Projects/Win32/VC7.1/XPathWrapper/XPathWrapper.vcproj (original)
+++ xalan/c/branches/dbertoni/VisualStudioFixup/samples/Projects/Win32/VC7.1/XPathWrapper/XPathWrapper.vcproj Wed Dec 12 17:25:38 2007
@@ -22,7 +22,7 @@
Name="VCCLCompilerTool"
InlineFunctionExpansion="2"
AdditionalIncludeDirectories="..\..\..\..\..\include\xalanc,..\..\..\..\..\include"
- PreprocessorDefinitions="WIN32,NDEBUG,_CONSOLE"
+ PreprocessorDefinitions="NDEBUG"
StringPooling="TRUE"
RuntimeLibrary="2"
EnableFunctionLevelLinking="TRUE"
@@ -82,7 +82,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\..\..\..\include\xalanc,..\..\..\..\..\include"
- PreprocessorDefinitions="WIN32,_DEBUG,_CONSOLE"
+ PreprocessorDefinitions=""
BasicRuntimeChecks="3"
RuntimeLibrary="3"
RuntimeTypeInfo="TRUE"
Modified: xalan/c/branches/dbertoni/VisualStudioFixup/samples/Projects/Win32/VC7.1/XalanTransform/XalanTransform.vcproj
URL: http://svn.apache.org/viewvc/xalan/c/branches/dbertoni/VisualStudioFixup/samples/Projects/Win32/VC7.1/XalanTransform/XalanTransform.vcproj?rev=603798&r1=603797&r2=603798&view=diff
==============================================================================
--- xalan/c/branches/dbertoni/VisualStudioFixup/samples/Projects/Win32/VC7.1/XalanTransform/XalanTransform.vcproj (original)
+++ xalan/c/branches/dbertoni/VisualStudioFixup/samples/Projects/Win32/VC7.1/XalanTransform/XalanTransform.vcproj Wed Dec 12 17:25:38 2007
@@ -22,7 +22,7 @@
Name="VCCLCompilerTool"
InlineFunctionExpansion="2"
AdditionalIncludeDirectories="..\..\..\..\..\include\xalanc,..\..\..\..\..\include"
- PreprocessorDefinitions="WIN32,NDEBUG,_CONSOLE"
+ PreprocessorDefinitions="NDEBUG"
StringPooling="TRUE"
RuntimeLibrary="2"
EnableFunctionLevelLinking="TRUE"
@@ -82,7 +82,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\..\..\..\include\xalanc,..\..\..\..\..\include"
- PreprocessorDefinitions="WIN32,_DEBUG,_CONSOLE"
+ PreprocessorDefinitions=""
BasicRuntimeChecks="3"
RuntimeLibrary="3"
RuntimeTypeInfo="TRUE"
Modified: xalan/c/branches/dbertoni/VisualStudioFixup/samples/Projects/Win32/VC7.1/XalanTransformerCallback/XalanTransformerCallback.vcproj
URL: http://svn.apache.org/viewvc/xalan/c/branches/dbertoni/VisualStudioFixup/samples/Projects/Win32/VC7.1/XalanTransformerCallback/XalanTransformerCallback.vcproj?rev=603798&r1=603797&r2=603798&view=diff
==============================================================================
--- xalan/c/branches/dbertoni/VisualStudioFixup/samples/Projects/Win32/VC7.1/XalanTransformerCallback/XalanTransformerCallback.vcproj (original)
+++ xalan/c/branches/dbertoni/VisualStudioFixup/samples/Projects/Win32/VC7.1/XalanTransformerCallback/XalanTransformerCallback.vcproj Wed Dec 12 17:25:38 2007
@@ -22,7 +22,7 @@
Name="VCCLCompilerTool"
InlineFunctionExpansion="2"
AdditionalIncludeDirectories="..\..\..\..\..\include\xalanc,..\..\..\..\..\include"
- PreprocessorDefinitions="WIN32,NDEBUG,_CONSOLE"
+ PreprocessorDefinitions="NDEBUG"
StringPooling="TRUE"
RuntimeLibrary="2"
EnableFunctionLevelLinking="TRUE"
@@ -82,7 +82,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\..\..\..\include\xalanc,..\..\..\..\..\include"
- PreprocessorDefinitions="WIN32,_DEBUG,_CONSOLE"
+ PreprocessorDefinitions=""
BasicRuntimeChecks="3"
RuntimeLibrary="3"
RuntimeTypeInfo="TRUE"
Modified: xalan/c/branches/dbertoni/VisualStudioFixup/samples/Projects/Win32/VC7/ApacheModuleXSLT/ApacheModuleXSLT.vcproj
URL: http://svn.apache.org/viewvc/xalan/c/branches/dbertoni/VisualStudioFixup/samples/Projects/Win32/VC7/ApacheModuleXSLT/ApacheModuleXSLT.vcproj?rev=603798&r1=603797&r2=603798&view=diff
==============================================================================
--- xalan/c/branches/dbertoni/VisualStudioFixup/samples/Projects/Win32/VC7/ApacheModuleXSLT/ApacheModuleXSLT.vcproj (original)
+++ xalan/c/branches/dbertoni/VisualStudioFixup/samples/Projects/Win32/VC7/ApacheModuleXSLT/ApacheModuleXSLT.vcproj Wed Dec 12 17:25:38 2007
@@ -22,7 +22,7 @@
Name="VCCLCompilerTool"
InlineFunctionExpansion="2"
AdditionalIncludeDirectories="..\..\..\..\..\include\xalanc,..\..\..\..\..\include,\Apache Group\Apache\include"
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;APACHEMODULEXSLT_EXPORTS"
+ PreprocessorDefinitions="NDEBUG;APACHEMODULEXSLT_EXPORTS"
StringPooling="TRUE"
RuntimeLibrary="2"
EnableFunctionLevelLinking="TRUE"
@@ -78,7 +78,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="\Apache Group\Apache\include,..\..\..\..\..\include\xalanc,..\..\..\..\..\include"
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;APACHEMODULEXSLT_EXPORTS"
+ PreprocessorDefinitions="APACHEMODULEXSLT_EXPORTS"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
RuntimeTypeInfo="TRUE"
Modified: xalan/c/branches/dbertoni/VisualStudioFixup/samples/Projects/Win32/VC7/CompileStylesheet/CompileStylesheet.vcproj
URL: http://svn.apache.org/viewvc/xalan/c/branches/dbertoni/VisualStudioFixup/samples/Projects/Win32/VC7/CompileStylesheet/CompileStylesheet.vcproj?rev=603798&r1=603797&r2=603798&view=diff
==============================================================================
--- xalan/c/branches/dbertoni/VisualStudioFixup/samples/Projects/Win32/VC7/CompileStylesheet/CompileStylesheet.vcproj (original)
+++ xalan/c/branches/dbertoni/VisualStudioFixup/samples/Projects/Win32/VC7/CompileStylesheet/CompileStylesheet.vcproj Wed Dec 12 17:25:38 2007
@@ -22,7 +22,7 @@
Name="VCCLCompilerTool"
InlineFunctionExpansion="2"
AdditionalIncludeDirectories="..\..\..\..\..\include\xalanc,..\..\..\..\..\include"
- PreprocessorDefinitions="WIN32,NDEBUG,_CONSOLE"
+ PreprocessorDefinitions="NDEBUG"
StringPooling="TRUE"
RuntimeLibrary="2"
EnableFunctionLevelLinking="TRUE"
@@ -76,7 +76,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\..\..\..\include\xalanc,..\..\..\..\..\include"
- PreprocessorDefinitions="WIN32,_DEBUG,_CONSOLE"
+ PreprocessorDefinitions=""
BasicRuntimeChecks="3"
RuntimeLibrary="3"
RuntimeTypeInfo="TRUE"
Modified: xalan/c/branches/dbertoni/VisualStudioFixup/samples/Projects/Win32/VC7/DocumentBuilder/DocumentBuilder.vcproj
URL: http://svn.apache.org/viewvc/xalan/c/branches/dbertoni/VisualStudioFixup/samples/Projects/Win32/VC7/DocumentBuilder/DocumentBuilder.vcproj?rev=603798&r1=603797&r2=603798&view=diff
==============================================================================
--- xalan/c/branches/dbertoni/VisualStudioFixup/samples/Projects/Win32/VC7/DocumentBuilder/DocumentBuilder.vcproj (original)
+++ xalan/c/branches/dbertoni/VisualStudioFixup/samples/Projects/Win32/VC7/DocumentBuilder/DocumentBuilder.vcproj Wed Dec 12 17:25:38 2007
@@ -22,7 +22,7 @@
Name="VCCLCompilerTool"
InlineFunctionExpansion="2"
AdditionalIncludeDirectories="..\..\..\..\..\include\xalanc,..\..\..\..\..\include"
- PreprocessorDefinitions="WIN32,NDEBUG,_CONSOLE"
+ PreprocessorDefinitions="NDEBUG"
StringPooling="TRUE"
RuntimeLibrary="2"
EnableFunctionLevelLinking="TRUE"
@@ -76,7 +76,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\..\..\..\include\xalanc,..\..\..\..\..\include"
- PreprocessorDefinitions="WIN32,_DEBUG,_CONSOLE"
+ PreprocessorDefinitions=""
BasicRuntimeChecks="3"
RuntimeLibrary="3"
RuntimeTypeInfo="TRUE"
Modified: xalan/c/branches/dbertoni/VisualStudioFixup/samples/Projects/Win32/VC7/ExternalFunction/ExternalFunction.vcproj
URL: http://svn.apache.org/viewvc/xalan/c/branches/dbertoni/VisualStudioFixup/samples/Projects/Win32/VC7/ExternalFunction/ExternalFunction.vcproj?rev=603798&r1=603797&r2=603798&view=diff
==============================================================================
--- xalan/c/branches/dbertoni/VisualStudioFixup/samples/Projects/Win32/VC7/ExternalFunction/ExternalFunction.vcproj (original)
+++ xalan/c/branches/dbertoni/VisualStudioFixup/samples/Projects/Win32/VC7/ExternalFunction/ExternalFunction.vcproj Wed Dec 12 17:25:38 2007
@@ -22,7 +22,7 @@
Name="VCCLCompilerTool"
InlineFunctionExpansion="2"
AdditionalIncludeDirectories="..\..\..\..\..\include\xalanc,..\..\..\..\..\include"
- PreprocessorDefinitions="WIN32,NDEBUG,_CONSOLE"
+ PreprocessorDefinitions="NDEBUG"
StringPooling="TRUE"
RuntimeLibrary="2"
EnableFunctionLevelLinking="TRUE"
@@ -76,7 +76,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\..\..\..\include\xalanc,..\..\..\..\..\include"
- PreprocessorDefinitions="WIN32,_DEBUG,_CONSOLE"
+ PreprocessorDefinitions=""
BasicRuntimeChecks="3"
RuntimeLibrary="3"
RuntimeTypeInfo="TRUE"
Modified: xalan/c/branches/dbertoni/VisualStudioFixup/samples/Projects/Win32/VC7/ParsedSourceWrappers/ParsedSourceWrappers.vcproj
URL: http://svn.apache.org/viewvc/xalan/c/branches/dbertoni/VisualStudioFixup/samples/Projects/Win32/VC7/ParsedSourceWrappers/ParsedSourceWrappers.vcproj?rev=603798&r1=603797&r2=603798&view=diff
==============================================================================
--- xalan/c/branches/dbertoni/VisualStudioFixup/samples/Projects/Win32/VC7/ParsedSourceWrappers/ParsedSourceWrappers.vcproj (original)
+++ xalan/c/branches/dbertoni/VisualStudioFixup/samples/Projects/Win32/VC7/ParsedSourceWrappers/ParsedSourceWrappers.vcproj Wed Dec 12 17:25:38 2007
@@ -22,7 +22,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\..\..\..\include\xalanc,..\..\..\..\..\include"
- PreprocessorDefinitions="WIN32,_DEBUG,_CONSOLE"
+ PreprocessorDefinitions=""
BasicRuntimeChecks="3"
RuntimeLibrary="3"
RuntimeTypeInfo="TRUE"
@@ -78,7 +78,7 @@
Name="VCCLCompilerTool"
InlineFunctionExpansion="2"
AdditionalIncludeDirectories="..\..\..\..\..\include\xalanc,..\..\..\..\..\include"
- PreprocessorDefinitions="WIN32,NDEBUG,_CONSOLE"
+ PreprocessorDefinitions="NDEBUG"
StringPooling="TRUE"
RuntimeLibrary="2"
EnableFunctionLevelLinking="TRUE"
Modified: xalan/c/branches/dbertoni/VisualStudioFixup/samples/Projects/Win32/VC7/SerializeNodeSet/SerializeNodeSet.vcproj
URL: http://svn.apache.org/viewvc/xalan/c/branches/dbertoni/VisualStudioFixup/samples/Projects/Win32/VC7/SerializeNodeSet/SerializeNodeSet.vcproj?rev=603798&r1=603797&r2=603798&view=diff
==============================================================================
--- xalan/c/branches/dbertoni/VisualStudioFixup/samples/Projects/Win32/VC7/SerializeNodeSet/SerializeNodeSet.vcproj (original)
+++ xalan/c/branches/dbertoni/VisualStudioFixup/samples/Projects/Win32/VC7/SerializeNodeSet/SerializeNodeSet.vcproj Wed Dec 12 17:25:38 2007
@@ -22,7 +22,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\..\..\..\include\xalanc,..\..\..\..\..\include"
- PreprocessorDefinitions="WIN32,_DEBUG,_CONSOLE"
+ PreprocessorDefinitions=""
BasicRuntimeChecks="3"
RuntimeLibrary="3"
RuntimeTypeInfo="TRUE"
@@ -78,7 +78,7 @@
Name="VCCLCompilerTool"
InlineFunctionExpansion="2"
AdditionalIncludeDirectories="..\..\..\..\..\include\xalanc,..\..\..\..\..\include"
- PreprocessorDefinitions="WIN32,NDEBUG,_CONSOLE"
+ PreprocessorDefinitions="NDEBUG"
StringPooling="TRUE"
RuntimeLibrary="2"
EnableFunctionLevelLinking="TRUE"
Modified: xalan/c/branches/dbertoni/VisualStudioFixup/samples/Projects/Win32/VC7/SimpleTransform/SimpleTransform.vcproj
URL: http://svn.apache.org/viewvc/xalan/c/branches/dbertoni/VisualStudioFixup/samples/Projects/Win32/VC7/SimpleTransform/SimpleTransform.vcproj?rev=603798&r1=603797&r2=603798&view=diff
==============================================================================
--- xalan/c/branches/dbertoni/VisualStudioFixup/samples/Projects/Win32/VC7/SimpleTransform/SimpleTransform.vcproj (original)
+++ xalan/c/branches/dbertoni/VisualStudioFixup/samples/Projects/Win32/VC7/SimpleTransform/SimpleTransform.vcproj Wed Dec 12 17:25:38 2007
@@ -22,7 +22,7 @@
Name="VCCLCompilerTool"
InlineFunctionExpansion="2"
AdditionalIncludeDirectories="..\..\..\..\..\include\xalanc,..\..\..\..\..\include"
- PreprocessorDefinitions="WIN32,NDEBUG,_CONSOLE"
+ PreprocessorDefinitions="NDEBUG"
StringPooling="TRUE"
RuntimeLibrary="2"
EnableFunctionLevelLinking="TRUE"
@@ -76,7 +76,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\..\..\..\include\xalanc,..\..\..\..\..\include"
- PreprocessorDefinitions="WIN32,_DEBUG,_CONSOLE"
+ PreprocessorDefinitions=""
BasicRuntimeChecks="3"
RuntimeLibrary="3"
RuntimeTypeInfo="TRUE"
Modified: xalan/c/branches/dbertoni/VisualStudioFixup/samples/Projects/Win32/VC7/SimpleXPathAPI/SimpleXPathAPI.vcproj
URL: http://svn.apache.org/viewvc/xalan/c/branches/dbertoni/VisualStudioFixup/samples/Projects/Win32/VC7/SimpleXPathAPI/SimpleXPathAPI.vcproj?rev=603798&r1=603797&r2=603798&view=diff
==============================================================================
--- xalan/c/branches/dbertoni/VisualStudioFixup/samples/Projects/Win32/VC7/SimpleXPathAPI/SimpleXPathAPI.vcproj (original)
+++ xalan/c/branches/dbertoni/VisualStudioFixup/samples/Projects/Win32/VC7/SimpleXPathAPI/SimpleXPathAPI.vcproj Wed Dec 12 17:25:38 2007
@@ -22,7 +22,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\..\..\..\include\xalanc,..\..\..\..\..\include"
- PreprocessorDefinitions="WIN32,_DEBUG,_CONSOLE"
+ PreprocessorDefinitions=""
BasicRuntimeChecks="3"
RuntimeLibrary="3"
RuntimeTypeInfo="TRUE"
@@ -78,7 +78,7 @@
Name="VCCLCompilerTool"
InlineFunctionExpansion="2"
AdditionalIncludeDirectories="..\..\..\..\..\include\xalanc,..\..\..\..\..\include"
- PreprocessorDefinitions="WIN32,NDEBUG,_CONSOLE"
+ PreprocessorDefinitions="NDEBUG"
StringPooling="TRUE"
RuntimeLibrary="2"
EnableFunctionLevelLinking="TRUE"
Modified: xalan/c/branches/dbertoni/VisualStudioFixup/samples/Projects/Win32/VC7/SimpleXPathCAPI/SimpleXPathCAPI.vcproj
URL: http://svn.apache.org/viewvc/xalan/c/branches/dbertoni/VisualStudioFixup/samples/Projects/Win32/VC7/SimpleXPathCAPI/SimpleXPathCAPI.vcproj?rev=603798&r1=603797&r2=603798&view=diff
==============================================================================
--- xalan/c/branches/dbertoni/VisualStudioFixup/samples/Projects/Win32/VC7/SimpleXPathCAPI/SimpleXPathCAPI.vcproj (original)
+++ xalan/c/branches/dbertoni/VisualStudioFixup/samples/Projects/Win32/VC7/SimpleXPathCAPI/SimpleXPathCAPI.vcproj Wed Dec 12 17:25:38 2007
@@ -22,7 +22,7 @@
Name="VCCLCompilerTool"
InlineFunctionExpansion="2"
AdditionalIncludeDirectories="..\..\..\..\..\include\xalanc,..\..\..\..\..\include"
- PreprocessorDefinitions="WIN32,NDEBUG,_CONSOLE"
+ PreprocessorDefinitions="NDEBUG"
StringPooling="TRUE"
RuntimeLibrary="2"
EnableFunctionLevelLinking="TRUE"
@@ -76,7 +76,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\..\..\..\include\xalanc,..\..\..\..\..\include"
- PreprocessorDefinitions="WIN32,_DEBUG,_CONSOLE"
+ PreprocessorDefinitions=""
BasicRuntimeChecks="3"
RuntimeLibrary="3"
RuntimeTypeInfo="TRUE"
Modified: xalan/c/branches/dbertoni/VisualStudioFixup/samples/Projects/Win32/VC7/StreamTransform/StreamTransform.vcproj
URL: http://svn.apache.org/viewvc/xalan/c/branches/dbertoni/VisualStudioFixup/samples/Projects/Win32/VC7/StreamTransform/StreamTransform.vcproj?rev=603798&r1=603797&r2=603798&view=diff
==============================================================================
--- xalan/c/branches/dbertoni/VisualStudioFixup/samples/Projects/Win32/VC7/StreamTransform/StreamTransform.vcproj (original)
+++ xalan/c/branches/dbertoni/VisualStudioFixup/samples/Projects/Win32/VC7/StreamTransform/StreamTransform.vcproj Wed Dec 12 17:25:38 2007
@@ -22,7 +22,7 @@
Name="VCCLCompilerTool"
InlineFunctionExpansion="2"
AdditionalIncludeDirectories="..\..\..\..\..\include\xalanc,..\..\..\..\..\include"
- PreprocessorDefinitions="WIN32,NDEBUG,_CONSOLE"
+ PreprocessorDefinitions="NDEBUG"
StringPooling="TRUE"
RuntimeLibrary="2"
EnableFunctionLevelLinking="TRUE"
@@ -76,7 +76,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\..\..\..\include\xalanc,..\..\..\..\..\include"
- PreprocessorDefinitions="WIN32,_DEBUG,_CONSOLE"
+ PreprocessorDefinitions=""
BasicRuntimeChecks="3"
RuntimeLibrary="3"
RuntimeTypeInfo="TRUE"
Modified: xalan/c/branches/dbertoni/VisualStudioFixup/samples/Projects/Win32/VC7/ThreadSafe/ThreadSafe.vcproj
URL: http://svn.apache.org/viewvc/xalan/c/branches/dbertoni/VisualStudioFixup/samples/Projects/Win32/VC7/ThreadSafe/ThreadSafe.vcproj?rev=603798&r1=603797&r2=603798&view=diff
==============================================================================
--- xalan/c/branches/dbertoni/VisualStudioFixup/samples/Projects/Win32/VC7/ThreadSafe/ThreadSafe.vcproj (original)
+++ xalan/c/branches/dbertoni/VisualStudioFixup/samples/Projects/Win32/VC7/ThreadSafe/ThreadSafe.vcproj Wed Dec 12 17:25:38 2007
@@ -22,7 +22,7 @@
Name="VCCLCompilerTool"
InlineFunctionExpansion="2"
AdditionalIncludeDirectories="..\..\..\..\..\include\xalanc,..\..\..\..\..\include"
- PreprocessorDefinitions="WIN32,NDEBUG,_CONSOLE"
+ PreprocessorDefinitions="NDEBUG"
StringPooling="TRUE"
RuntimeLibrary="2"
EnableFunctionLevelLinking="TRUE"
@@ -76,7 +76,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\..\..\..\include\xalanc,..\..\..\..\..\include"
- PreprocessorDefinitions="WIN32,_DEBUG,_CONSOLE"
+ PreprocessorDefinitions=""
BasicRuntimeChecks="3"
RuntimeLibrary="3"
RuntimeTypeInfo="TRUE"
Modified: xalan/c/branches/dbertoni/VisualStudioFixup/samples/Projects/Win32/VC7/TraceListen/TraceListen.vcproj
URL: http://svn.apache.org/viewvc/xalan/c/branches/dbertoni/VisualStudioFixup/samples/Projects/Win32/VC7/TraceListen/TraceListen.vcproj?rev=603798&r1=603797&r2=603798&view=diff
==============================================================================
--- xalan/c/branches/dbertoni/VisualStudioFixup/samples/Projects/Win32/VC7/TraceListen/TraceListen.vcproj (original)
+++ xalan/c/branches/dbertoni/VisualStudioFixup/samples/Projects/Win32/VC7/TraceListen/TraceListen.vcproj Wed Dec 12 17:25:38 2007
@@ -22,7 +22,7 @@
Name="VCCLCompilerTool"
InlineFunctionExpansion="2"
AdditionalIncludeDirectories="..\..\..\..\..\include\xalanc,..\..\..\..\..\include"
- PreprocessorDefinitions="WIN32,NDEBUG,_CONSOLE"
+ PreprocessorDefinitions="NDEBUG"
StringPooling="TRUE"
RuntimeLibrary="2"
EnableFunctionLevelLinking="TRUE"
@@ -76,7 +76,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\..\..\..\include\xalanc,..\..\..\..\..\include"
- PreprocessorDefinitions="WIN32,_DEBUG,_CONSOLE"
+ PreprocessorDefinitions=""
BasicRuntimeChecks="3"
RuntimeLibrary="3"
RuntimeTypeInfo="TRUE"
Modified: xalan/c/branches/dbertoni/VisualStudioFixup/samples/Projects/Win32/VC7/TransformToXercesDOM/TransformToXercesDOM.vcproj
URL: http://svn.apache.org/viewvc/xalan/c/branches/dbertoni/VisualStudioFixup/samples/Projects/Win32/VC7/TransformToXercesDOM/TransformToXercesDOM.vcproj?rev=603798&r1=603797&r2=603798&view=diff
==============================================================================
--- xalan/c/branches/dbertoni/VisualStudioFixup/samples/Projects/Win32/VC7/TransformToXercesDOM/TransformToXercesDOM.vcproj (original)
+++ xalan/c/branches/dbertoni/VisualStudioFixup/samples/Projects/Win32/VC7/TransformToXercesDOM/TransformToXercesDOM.vcproj Wed Dec 12 17:25:38 2007
@@ -22,7 +22,7 @@
Name="VCCLCompilerTool"
InlineFunctionExpansion="2"
AdditionalIncludeDirectories="..\..\..\..\..\include\xalanc,..\..\..\..\..\include"
- PreprocessorDefinitions="WIN32,NDEBUG,_CONSOLE"
+ PreprocessorDefinitions="NDEBUG"
StringPooling="TRUE"
RuntimeLibrary="2"
EnableFunctionLevelLinking="TRUE"
@@ -76,7 +76,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\..\..\..\include\xalanc,..\..\..\..\..\include"
- PreprocessorDefinitions="WIN32,_DEBUG,_CONSOLE"
+ PreprocessorDefinitions=""
BasicRuntimeChecks="3"
RuntimeLibrary="3"
RuntimeTypeInfo="TRUE"
Modified: xalan/c/branches/dbertoni/VisualStudioFixup/samples/Projects/Win32/VC7/UseStylesheetParam/UseStylesheetParam.vcproj
URL: http://svn.apache.org/viewvc/xalan/c/branches/dbertoni/VisualStudioFixup/samples/Projects/Win32/VC7/UseStylesheetParam/UseStylesheetParam.vcproj?rev=603798&r1=603797&r2=603798&view=diff
==============================================================================
--- xalan/c/branches/dbertoni/VisualStudioFixup/samples/Projects/Win32/VC7/UseStylesheetParam/UseStylesheetParam.vcproj (original)
+++ xalan/c/branches/dbertoni/VisualStudioFixup/samples/Projects/Win32/VC7/UseStylesheetParam/UseStylesheetParam.vcproj Wed Dec 12 17:25:38 2007
@@ -22,7 +22,7 @@
Name="VCCLCompilerTool"
InlineFunctionExpansion="2"
AdditionalIncludeDirectories="..\..\..\..\..\include\xalanc,..\..\..\..\..\include"
- PreprocessorDefinitions="WIN32,NDEBUG,_CONSOLE"
+ PreprocessorDefinitions="NDEBUG"
StringPooling="TRUE"
RuntimeLibrary="2"
EnableFunctionLevelLinking="TRUE"
@@ -76,7 +76,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\..\..\..\include\xalanc,..\..\..\..\..\include"
- PreprocessorDefinitions="WIN32,_DEBUG,_CONSOLE"
+ PreprocessorDefinitions=""
BasicRuntimeChecks="3"
RuntimeLibrary="3"
RuntimeTypeInfo="TRUE"
Modified: xalan/c/branches/dbertoni/VisualStudioFixup/samples/Projects/Win32/VC7/XPathWrapper/XPathWrapper.vcproj
URL: http://svn.apache.org/viewvc/xalan/c/branches/dbertoni/VisualStudioFixup/samples/Projects/Win32/VC7/XPathWrapper/XPathWrapper.vcproj?rev=603798&r1=603797&r2=603798&view=diff
==============================================================================
--- xalan/c/branches/dbertoni/VisualStudioFixup/samples/Projects/Win32/VC7/XPathWrapper/XPathWrapper.vcproj (original)
+++ xalan/c/branches/dbertoni/VisualStudioFixup/samples/Projects/Win32/VC7/XPathWrapper/XPathWrapper.vcproj Wed Dec 12 17:25:38 2007
@@ -22,7 +22,7 @@
Name="VCCLCompilerTool"
InlineFunctionExpansion="2"
AdditionalIncludeDirectories="..\..\..\..\..\include\xalanc,..\..\..\..\..\include"
- PreprocessorDefinitions="WIN32,NDEBUG,_CONSOLE"
+ PreprocessorDefinitions="NDEBUG"
StringPooling="TRUE"
RuntimeLibrary="2"
EnableFunctionLevelLinking="TRUE"
@@ -76,7 +76,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\..\..\..\include\xalanc,..\..\..\..\..\include"
- PreprocessorDefinitions="WIN32,_DEBUG,_CONSOLE"
+ PreprocessorDefinitions=""
BasicRuntimeChecks="3"
RuntimeLibrary="3"
RuntimeTypeInfo="TRUE"
Modified: xalan/c/branches/dbertoni/VisualStudioFixup/samples/Projects/Win32/VC7/XalanTransform/XalanTransform.vcproj
URL: http://svn.apache.org/viewvc/xalan/c/branches/dbertoni/VisualStudioFixup/samples/Projects/Win32/VC7/XalanTransform/XalanTransform.vcproj?rev=603798&r1=603797&r2=603798&view=diff
==============================================================================
--- xalan/c/branches/dbertoni/VisualStudioFixup/samples/Projects/Win32/VC7/XalanTransform/XalanTransform.vcproj (original)
+++ xalan/c/branches/dbertoni/VisualStudioFixup/samples/Projects/Win32/VC7/XalanTransform/XalanTransform.vcproj Wed Dec 12 17:25:38 2007
@@ -22,7 +22,7 @@
Name="VCCLCompilerTool"
InlineFunctionExpansion="2"
AdditionalIncludeDirectories="..\..\..\..\..\include\xalanc,..\..\..\..\..\include"
- PreprocessorDefinitions="WIN32,NDEBUG,_CONSOLE"
+ PreprocessorDefinitions="NDEBUG"
StringPooling="TRUE"
RuntimeLibrary="2"
EnableFunctionLevelLinking="TRUE"
@@ -76,7 +76,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\..\..\..\include\xalanc,..\..\..\..\..\include"
- PreprocessorDefinitions="WIN32,_DEBUG,_CONSOLE"
+ PreprocessorDefinitions=""
BasicRuntimeChecks="3"
RuntimeLibrary="3"
RuntimeTypeInfo="TRUE"
Modified: xalan/c/branches/dbertoni/VisualStudioFixup/samples/Projects/Win32/VC7/XalanTransformerCallback/XalanTransformerCallback.vcproj
URL: http://svn.apache.org/viewvc/xalan/c/branches/dbertoni/VisualStudioFixup/samples/Projects/Win32/VC7/XalanTransformerCallback/XalanTransformerCallback.vcproj?rev=603798&r1=603797&r2=603798&view=diff
==============================================================================
--- xalan/c/branches/dbertoni/VisualStudioFixup/samples/Projects/Win32/VC7/XalanTransformerCallback/XalanTransformerCallback.vcproj (original)
+++ xalan/c/branches/dbertoni/VisualStudioFixup/samples/Projects/Win32/VC7/XalanTransformerCallback/XalanTransformerCallback.vcproj Wed Dec 12 17:25:38 2007
@@ -22,7 +22,7 @@
Name="VCCLCompilerTool"
InlineFunctionExpansion="2"
AdditionalIncludeDirectories="..\..\..\..\..\include\xalanc,..\..\..\..\..\include"
- PreprocessorDefinitions="WIN32,NDEBUG,_CONSOLE"
+ PreprocessorDefinitions="NDEBUG"
StringPooling="TRUE"
RuntimeLibrary="2"
EnableFunctionLevelLinking="TRUE"
@@ -76,7 +76,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\..\..\..\include\xalanc,..\..\..\..\..\include"
- PreprocessorDefinitions="WIN32,_DEBUG,_CONSOLE"
+ PreprocessorDefinitions=""
BasicRuntimeChecks="3"
RuntimeLibrary="3"
RuntimeTypeInfo="TRUE"
Modified: xalan/c/branches/dbertoni/VisualStudioFixup/samples/SimpleTransform/XalanMemoryManagerImpl.hpp
URL: http://svn.apache.org/viewvc/xalan/c/branches/dbertoni/VisualStudioFixup/samples/SimpleTransform/XalanMemoryManagerImpl.hpp?rev=603798&r1=603797&r2=603798&view=diff
==============================================================================
--- xalan/c/branches/dbertoni/VisualStudioFixup/samples/SimpleTransform/XalanMemoryManagerImpl.hpp (original)
+++ xalan/c/branches/dbertoni/VisualStudioFixup/samples/SimpleTransform/XalanMemoryManagerImpl.hpp Wed Dec 12 17:25:38 2007
@@ -29,15 +29,10 @@
#include <xercesc/framework/MemoryManager.hpp>
-#if defined(WIN32)
+#if defined(XALAN_WINDOWS)
#include <windows.h>
#include <stdexcept>
#include <stdlib.h>
-#endif
-
-
-
-#if defined(WIN32)
class XalanMemoryManagerImpl : public XALAN_CPP_NAMESPACE_QUALIFIER MemoryManagerType
Modified: xalan/c/branches/dbertoni/VisualStudioFixup/src/xalanc/DOMSupport/DOMSupportDefinitions.hpp
URL: http://svn.apache.org/viewvc/xalan/c/branches/dbertoni/VisualStudioFixup/src/xalanc/DOMSupport/DOMSupportDefinitions.hpp?rev=603798&r1=603797&r2=603798&view=diff
==============================================================================
--- xalan/c/branches/dbertoni/VisualStudioFixup/src/xalanc/DOMSupport/DOMSupportDefinitions.hpp (original)
+++ xalan/c/branches/dbertoni/VisualStudioFixup/src/xalanc/DOMSupport/DOMSupportDefinitions.hpp Wed Dec 12 17:25:38 2007
@@ -24,7 +24,7 @@
-#if defined(XALAN_DOMSUPPORT_BUILD_DLL)
+#if defined(XALAN_BUILD_DLL)
#define XALAN_DOMSUPPORT_EXPORT XALAN_PLATFORM_EXPORT
Modified: xalan/c/branches/dbertoni/VisualStudioFixup/src/xalanc/Harness/XalanFileUtility.cpp
URL: http://svn.apache.org/viewvc/xalan/c/branches/dbertoni/VisualStudioFixup/src/xalanc/Harness/XalanFileUtility.cpp?rev=603798&r1=603797&r2=603798&view=diff
==============================================================================
--- xalan/c/branches/dbertoni/VisualStudioFixup/src/xalanc/Harness/XalanFileUtility.cpp (original)
+++ xalan/c/branches/dbertoni/VisualStudioFixup/src/xalanc/Harness/XalanFileUtility.cpp Wed Dec 12 17:25:38 2007
@@ -26,7 +26,7 @@
#include <climits>
#include <cstring>
-#if defined(WIN32)
+#if defined(XALAN_WINDOWS)
#include <direct.h>
#define PATH_MAX _MAX_PATH
#define chdir _chdir
@@ -212,7 +212,7 @@
-#if !defined(WIN32)
+#if !defined(XALAN_WINDOWS)
XalanDOMString&
XalanFileUtility::getDrive(XalanDOMString& theResult)
{
@@ -387,7 +387,8 @@
//
if (fsetOut)
{
- unsigned int ii = lastIndexOf(args.base, s_pathSep[0]);
+ const XalanDOMString::size_type ii =
+ lastIndexOf(args.base, s_pathSep[0]);
if (ii < length(args.base))
{
@@ -548,7 +549,7 @@
//cout << "Couldn't change to " << directory << ", will create it." << endl;
CharVectorType theResult1(m_memoryManager);
TranscodeToLocalCodePage(directory, theResult1, true);
-#if defined(WIN32)
+#if defined(XALAN_WINDOWS)
if ( !mkdir(c_str(theResult)))
#else
if ( !mkdir(c_str(theResult), DIR_MODE_BITS))
@@ -2125,7 +2126,7 @@
const XalanDOMChar XalanFileUtility::s_pathSep[] =
{
-#if defined(WIN32)
+#if defined(XALAN_WINDOWS)
XalanUnicode::charReverseSolidus,
#else
XalanUnicode::charSolidus,
Modified: xalan/c/branches/dbertoni/VisualStudioFixup/src/xalanc/Harness/XalanHarnessDefinitions.hpp
URL: http://svn.apache.org/viewvc/xalan/c/branches/dbertoni/VisualStudioFixup/src/xalanc/Harness/XalanHarnessDefinitions.hpp?rev=603798&r1=603797&r2=603798&view=diff
==============================================================================
--- xalan/c/branches/dbertoni/VisualStudioFixup/src/xalanc/Harness/XalanHarnessDefinitions.hpp (original)
+++ xalan/c/branches/dbertoni/VisualStudioFixup/src/xalanc/Harness/XalanHarnessDefinitions.hpp Wed Dec 12 17:25:38 2007
@@ -20,7 +20,7 @@
#include "xalanc/Include/PlatformDefinitions.hpp"
-#if defined(XALAN_HARNESS_BUILD_DLL)
+#if defined(XALAN_BUILD_DLL)
# define XALAN_HARNESS_EXPORT XALAN_PLATFORM_EXPORT
# define XALAN_HARNESS_EXPORT_FUNCTION(T) XALAN_PLATFORM_EXPORT_FUNCTION(T)
#else
Modified: xalan/c/branches/dbertoni/VisualStudioFixup/src/xalanc/ICUBridge/ICUBridgeDefinitions.hpp
URL: http://svn.apache.org/viewvc/xalan/c/branches/dbertoni/VisualStudioFixup/src/xalanc/ICUBridge/ICUBridgeDefinitions.hpp?rev=603798&r1=603797&r2=603798&view=diff
==============================================================================
--- xalan/c/branches/dbertoni/VisualStudioFixup/src/xalanc/ICUBridge/ICUBridgeDefinitions.hpp (original)
+++ xalan/c/branches/dbertoni/VisualStudioFixup/src/xalanc/ICUBridge/ICUBridgeDefinitions.hpp Wed Dec 12 17:25:38 2007
@@ -24,7 +24,7 @@
-#if defined(XALAN_ICUBRIDGE_BUILD_DLL)
+#if defined(XALAN_BUILD_DLL)
#define XALAN_ICUBRIDGE_EXPORT XALAN_PLATFORM_EXPORT
Modified: xalan/c/branches/dbertoni/VisualStudioFixup/src/xalanc/ICUBridge/ICUXalanNumberFormatProxy.cpp
URL: http://svn.apache.org/viewvc/xalan/c/branches/dbertoni/VisualStudioFixup/src/xalanc/ICUBridge/ICUXalanNumberFormatProxy.cpp?rev=603798&r1=603797&r2=603798&view=diff
==============================================================================
--- xalan/c/branches/dbertoni/VisualStudioFixup/src/xalanc/ICUBridge/ICUXalanNumberFormatProxy.cpp (original)
+++ xalan/c/branches/dbertoni/VisualStudioFixup/src/xalanc/ICUBridge/ICUXalanNumberFormatProxy.cpp Wed Dec 12 17:25:38 2007
@@ -126,6 +126,27 @@
+#if defined(XALAN_SIZE_T_NOT_STANDARD_TYPE)
+
+ /**
+ * Format a number into a string.
+ *
+ * @param theValue number to format
+ * @param theResult the string result
+ */
+XalanDOMString&
+ICUXalanNumberFormatProxy::format(
+ size_t theValue,
+ XalanDOMString& theResult)
+
+{
+ // $$$ ToDo: Fix this!
+ return format(static_cast<unsigned long>(theValue), theResult);
+}
+#endif
+
+
+
bool
ICUXalanNumberFormatProxy::isGroupingUsed() const
{
Modified: xalan/c/branches/dbertoni/VisualStudioFixup/src/xalanc/ICUBridge/ICUXalanNumberFormatProxy.hpp
URL: http://svn.apache.org/viewvc/xalan/c/branches/dbertoni/VisualStudioFixup/src/xalanc/ICUBridge/ICUXalanNumberFormatProxy.hpp?rev=603798&r1=603797&r2=603798&view=diff
==============================================================================
--- xalan/c/branches/dbertoni/VisualStudioFixup/src/xalanc/ICUBridge/ICUXalanNumberFormatProxy.hpp (original)
+++ xalan/c/branches/dbertoni/VisualStudioFixup/src/xalanc/ICUBridge/ICUXalanNumberFormatProxy.hpp Wed Dec 12 17:25:38 2007
@@ -70,6 +70,20 @@
virtual XalanDOMString&
format(unsigned long theValue, XalanDOMString& theResult);
+#if defined(XALAN_SIZE_T_NOT_STANDARD_TYPE)
+
+ /**
+ * Format a number into a string.
+ *
+ * @param theValue number to format
+ * @param theResult the string result
+ */
+ virtual XalanDOMString&
+ format(
+ size_t theValue,
+ XalanDOMString& theResult);
+
+#endif
virtual bool
isGroupingUsed() const;
Modified: xalan/c/branches/dbertoni/VisualStudioFixup/src/xalanc/Include/VCPPDefinitions.hpp
URL: http://svn.apache.org/viewvc/xalan/c/branches/dbertoni/VisualStudioFixup/src/xalanc/Include/VCPPDefinitions.hpp?rev=603798&r1=603797&r2=603798&view=diff
==============================================================================
--- xalan/c/branches/dbertoni/VisualStudioFixup/src/xalanc/Include/VCPPDefinitions.hpp (original)
+++ xalan/c/branches/dbertoni/VisualStudioFixup/src/xalanc/Include/VCPPDefinitions.hpp Wed Dec 12 17:25:38 2007
@@ -58,5 +58,15 @@
#define XALAN_HAS_STD_DISTANCE
#define XALAN_NO_REENTRANT_TIME_FUNCTIONS
+#if defined(_WIN64)
+#define XALAN_SIZE_T_NOT_STANDARD_TYPE
+#endif
+#define XALAN_WINDOWS
+
+#if defined(_DEBUG) && defined(NDEBUG)
+#error NDEBUG must not be defined when _DEBUG is defined.
+#elif !defined(_DEBUG) && !defined(NDEBUG)
+#error NDEBUG must be defined when _DEBUG is not defined.
+#endif
#endif // VCPPDEFINITIONS_HEADER_GUARD_1357924680
Modified: xalan/c/branches/dbertoni/VisualStudioFixup/src/xalanc/PlatformSupport/DOMStringHelper.cpp
URL: http://svn.apache.org/viewvc/xalan/c/branches/dbertoni/VisualStudioFixup/src/xalanc/PlatformSupport/DOMStringHelper.cpp?rev=603798&r1=603797&r2=603798&view=diff
==============================================================================
--- xalan/c/branches/dbertoni/VisualStudioFixup/src/xalanc/PlatformSupport/DOMStringHelper.cpp (original)
+++ xalan/c/branches/dbertoni/VisualStudioFixup/src/xalanc/PlatformSupport/DOMStringHelper.cpp Wed Dec 12 17:25:38 2007
@@ -1786,6 +1786,18 @@
+XALAN_PLATFORMSUPPORT_EXPORT_FUNCTION(XalanDOMString&)
+SizeTypeToDOMString(
+ size_t theValue,
+ XalanDOMString& theResult)
+{
+ ScalarToDecimalString(theValue, theResult);
+
+ return theResult;
+}
+
+
+
XALAN_PLATFORMSUPPORT_EXPORT_FUNCTION(bool)
isXMLWhitespace(const XalanDOMString& string)
{
Modified: xalan/c/branches/dbertoni/VisualStudioFixup/src/xalanc/PlatformSupport/DOMStringHelper.hpp
URL: http://svn.apache.org/viewvc/xalan/c/branches/dbertoni/VisualStudioFixup/src/xalanc/PlatformSupport/DOMStringHelper.hpp?rev=603798&r1=603797&r2=603798&view=diff
==============================================================================
--- xalan/c/branches/dbertoni/VisualStudioFixup/src/xalanc/PlatformSupport/DOMStringHelper.hpp (original)
+++ xalan/c/branches/dbertoni/VisualStudioFixup/src/xalanc/PlatformSupport/DOMStringHelper.hpp Wed Dec 12 17:25:38 2007
@@ -773,6 +773,23 @@
/**
+ * Converts a size_t value and appends the
+ * result to a XalanDOMString.
+ *
+ * @param theValue number to be converted
+ * @param theResult the string to append with the result
+ * @return a reference to the passed string result.
+ */
+XALAN_PLATFORMSUPPORT_EXPORT_FUNCTION(XalanDOMString&)
+SizeTypeToDOMString(
+ size_t theValue,
+ XalanDOMString& theResult);
+
+
+
+
+
+/**
* Converts an unsigned long value and appends the
* result to a XalanDOMString.
*
Modified: xalan/c/branches/dbertoni/VisualStudioFixup/src/xalanc/PlatformSupport/DoubleSupport.cpp
URL: http://svn.apache.org/viewvc/xalan/c/branches/dbertoni/VisualStudioFixup/src/xalanc/PlatformSupport/DoubleSupport.cpp?rev=603798&r1=603797&r2=603798&view=diff
==============================================================================
--- xalan/c/branches/dbertoni/VisualStudioFixup/src/xalanc/PlatformSupport/DoubleSupport.cpp (original)
+++ xalan/c/branches/dbertoni/VisualStudioFixup/src/xalanc/PlatformSupport/DoubleSupport.cpp Wed Dec 12 17:25:38 2007
@@ -260,17 +260,17 @@
else if (theLHS == 0.0L)
{
// This is NaN...
- return DoubleSupport::getNaN();
+ return getNaN();
}
else if (theLHS > 0.0L && isPositiveZero(theRHS) == true)
{
// This is positive infinity...
- return DoubleSupport::getPositiveInfinity();
+ return getPositiveInfinity();
}
else
{
// This is negative infinity...
- return DoubleSupport::getNegativeInfinity();
+ return getNegativeInfinity();
}
}
@@ -757,7 +757,7 @@
{
return getPositiveInfinity();
}
- if (isNegativeInfinity(theValue))
+ else if (isNegativeInfinity(theValue))
{
return getNegativeInfinity();
}
Modified: xalan/c/branches/dbertoni/VisualStudioFixup/src/xalanc/PlatformSupport/DoubleSupport.hpp
URL: http://svn.apache.org/viewvc/xalan/c/branches/dbertoni/VisualStudioFixup/src/xalanc/PlatformSupport/DoubleSupport.hpp?rev=603798&r1=603797&r2=603798&view=diff
==============================================================================
--- xalan/c/branches/dbertoni/VisualStudioFixup/src/xalanc/PlatformSupport/DoubleSupport.hpp (original)
+++ xalan/c/branches/dbertoni/VisualStudioFixup/src/xalanc/PlatformSupport/DoubleSupport.hpp Wed Dec 12 17:25:38 2007
@@ -25,6 +25,9 @@
+#if defined(_MSC_VER)
+#include <float.h>
+#endif
#include <cmath>
#include <functional>
@@ -62,7 +65,7 @@
// Use these functions to determine if a value represents one of these
- // specia values. On some platforms, regular C/C++ operators don't work
+ // special values. On some platforms, regular C/C++ operators don't work
// as we need them too, so we have these helper functions.
/**
@@ -74,7 +77,13 @@
static bool
isNaN(double theNumber)
{
- return s_NaN == theNumber;
+#if defined(_MSC_VER)
+ return _isnan(theNumber) != 0;
+#elif defined(XALAN_POSIX2_AVAILABLE)
+ return isnan(theNumber) != 0;
+#else
+ return s_NaN == theNumber;
+#endif
}
/**
@@ -603,7 +612,7 @@
#endif
}
- typedef union
+ union NumberUnion
{
double d;
struct
@@ -620,8 +629,7 @@
return dwords.dw1 == temp.dwords.dw1 &&
dwords.dw2 == temp.dwords.dw2;
}
-
- } NumberUnion;
+ };
private:
Modified: xalan/c/branches/dbertoni/VisualStudioFixup/src/xalanc/PlatformSupport/PlatformSupportDefinitions.hpp
URL: http://svn.apache.org/viewvc/xalan/c/branches/dbertoni/VisualStudioFixup/src/xalanc/PlatformSupport/PlatformSupportDefinitions.hpp?rev=603798&r1=603797&r2=603798&view=diff
==============================================================================
--- xalan/c/branches/dbertoni/VisualStudioFixup/src/xalanc/PlatformSupport/PlatformSupportDefinitions.hpp (original)
+++ xalan/c/branches/dbertoni/VisualStudioFixup/src/xalanc/PlatformSupport/PlatformSupportDefinitions.hpp Wed Dec 12 17:25:38 2007
@@ -24,7 +24,7 @@
-#if defined(XALAN_PLATFORMSUPPORT_BUILD_DLL)
+#if defined(XALAN_BUILD_DLL)
#define XALAN_PLATFORMSUPPORT_EXPORT XALAN_PLATFORM_EXPORT
Modified: xalan/c/branches/dbertoni/VisualStudioFixup/src/xalanc/PlatformSupport/XalanFileOutputStream.cpp
URL: http://svn.apache.org/viewvc/xalan/c/branches/dbertoni/VisualStudioFixup/src/xalanc/PlatformSupport/XalanFileOutputStream.cpp?rev=603798&r1=603797&r2=603798&view=diff
==============================================================================
--- xalan/c/branches/dbertoni/VisualStudioFixup/src/xalanc/PlatformSupport/XalanFileOutputStream.cpp (original)
+++ xalan/c/branches/dbertoni/VisualStudioFixup/src/xalanc/PlatformSupport/XalanFileOutputStream.cpp Wed Dec 12 17:25:38 2007
@@ -20,7 +20,7 @@
-#if !defined(WIN32)
+#if !defined(XALAN_WINDOWS)
#include <cerrno>
#endif
@@ -120,7 +120,7 @@
{
typedef XalanFileOutputStream::HandleType HandleType;
-#if defined(WIN32)
+#if defined(XALAN_WINDOWS)
HandleType theFileHandle = CreateFileW(
c_wstr(theFileName),
GENERIC_WRITE,
@@ -199,7 +199,7 @@
m_fileName(theFileName, theManager),
m_handle(openFile(theFileName, theManager))
{
-#if defined(WIN32)
+#if defined(XALAN_WINDOWS)
if (m_handle == INVALID_HANDLE_VALUE)
{
XalanDOMString theBuffer(theManager);
@@ -247,7 +247,7 @@
XalanFileOutputStream::~XalanFileOutputStream()
{
-#if defined(WIN32)
+#if defined(XALAN_WINDOWS)
if (m_handle != INVALID_HANDLE_VALUE)
{
CloseHandle(m_handle);
@@ -265,7 +265,7 @@
void
XalanFileOutputStream::doFlush()
{
-#if !defined(WIN32)
+#if !defined(XALAN_WINDOWS)
if (fflush(m_handle) != 0)
{
XalanDOMString theBuffer(getMemoryManager());
@@ -284,7 +284,7 @@
const char* theBuffer,
size_type theBufferLength)
{
-#if defined(WIN32)
+#if defined(XALAN_WINDOWS)
DWORD theBytesWritten;
assert(size_t(DWORD(theBufferLength)) == theBufferLength);
Modified: xalan/c/branches/dbertoni/VisualStudioFixup/src/xalanc/PlatformSupport/XalanFileOutputStream.hpp
URL: http://svn.apache.org/viewvc/xalan/c/branches/dbertoni/VisualStudioFixup/src/xalanc/PlatformSupport/XalanFileOutputStream.hpp?rev=603798&r1=603797&r2=603798&view=diff
==============================================================================
--- xalan/c/branches/dbertoni/VisualStudioFixup/src/xalanc/PlatformSupport/XalanFileOutputStream.hpp (original)
+++ xalan/c/branches/dbertoni/VisualStudioFixup/src/xalanc/PlatformSupport/XalanFileOutputStream.hpp Wed Dec 12 17:25:38 2007
@@ -25,7 +25,7 @@
-#if defined(WIN32)
+#if defined(XALAN_WINDOWS)
#include <windows.h>
#else
#include <cstdio>
@@ -48,7 +48,7 @@
enum { eDefaultBufferSize = 8192 };
-#if defined(WIN32)
+#if defined(XALAN_WINDOWS)
typedef HANDLE HandleType;
#else
typedef FILE* HandleType;
Modified: xalan/c/branches/dbertoni/VisualStudioFixup/src/xalanc/PlatformSupport/XalanICUMessageLoader.cpp
URL: http://svn.apache.org/viewvc/xalan/c/branches/dbertoni/VisualStudioFixup/src/xalanc/PlatformSupport/XalanICUMessageLoader.cpp?rev=603798&r1=603797&r2=603798&view=diff
==============================================================================
--- xalan/c/branches/dbertoni/VisualStudioFixup/src/xalanc/PlatformSupport/XalanICUMessageLoader.cpp (original)
+++ xalan/c/branches/dbertoni/VisualStudioFixup/src/xalanc/PlatformSupport/XalanICUMessageLoader.cpp Wed Dec 12 17:25:38 2007
@@ -36,7 +36,7 @@
#include "xalanc/Include/XalanVersion.hpp"
-#ifdef WIN32
+#if defined(XALAN_WINDOWS)
#define XALAN_MESSAGES_NAME XalanMessages
#else
#define XALAN_MESSAGES_NAME xalanMsg
@@ -47,7 +47,7 @@
#define MAKE_STRING(a) #a
#define INVK_MAKE_STRING(a) MAKE_STRING(a)
-#ifdef WIN32
+#if defined(XALAN_WINDOWS)
#if _MSC_VER >= 1400
@@ -81,13 +81,13 @@
INVK_CAT2_RAW_NUMERIC_SEP_UNDERSCORE(XALAN_VERSION_MAJOR,XALAN_VERSION_MINOR),\
ENTRY_POINT_SUFFIX)
-#else // NON-WIN32 systems
+#else // NON-WINDOWS systems
#define ICUDLL_ENTRYPOINT_NAME INVK_CAT2_RAW_NUMERIC(XALAN_MESSAGES_NAME_W_UNDERSCORE,dat)
#define PACKAGE_NAME XALAN_MESSAGES_NAME
-#endif // WIN32
+#endif // XALAN_WINDOWS
static const char* const sPackageName=INVK_MAKE_STRING(PACKAGE_NAME);
@@ -193,5 +193,6 @@
XALAN_CPP_NAMESPACE_END
#endif // defined (XALAN_ICU_MSG_LOADER)
+
Modified: xalan/c/branches/dbertoni/VisualStudioFixup/src/xalanc/PlatformSupport/XalanNumberFormat.cpp
URL: http://svn.apache.org/viewvc/xalan/c/branches/dbertoni/VisualStudioFixup/src/xalanc/PlatformSupport/XalanNumberFormat.cpp?rev=603798&r1=603797&r2=603798&view=diff
==============================================================================
--- xalan/c/branches/dbertoni/VisualStudioFixup/src/xalanc/PlatformSupport/XalanNumberFormat.cpp (original)
+++ xalan/c/branches/dbertoni/VisualStudioFixup/src/xalanc/PlatformSupport/XalanNumberFormat.cpp Wed Dec 12 17:25:38 2007
@@ -138,6 +138,30 @@
+#if defined(XALAN_SIZE_T_NOT_STANDARD_TYPE)
+
+ /**
+ * Format a number into a string.
+ *
+ * @param theValue number to format
+ * @param theResult the string result
+ */
+XalanDOMString&
+XalanNumberFormat::format(
+ size_t theValue,
+ XalanDOMString& theResult)
+
+{
+ SizeTypeToDOMString(theValue, theResult);
+
+ applyGrouping(theResult, theResult);
+
+ return theResult;
+}
+
+
+
+#endif
/*
* Convert a string value using the currently active values for grouping size
* and separator; returns the converted string
Modified: xalan/c/branches/dbertoni/VisualStudioFixup/src/xalanc/PlatformSupport/XalanNumberFormat.hpp
URL: http://svn.apache.org/viewvc/xalan/c/branches/dbertoni/VisualStudioFixup/src/xalanc/PlatformSupport/XalanNumberFormat.hpp?rev=603798&r1=603797&r2=603798&view=diff
==============================================================================
--- xalan/c/branches/dbertoni/VisualStudioFixup/src/xalanc/PlatformSupport/XalanNumberFormat.hpp (original)
+++ xalan/c/branches/dbertoni/VisualStudioFixup/src/xalanc/PlatformSupport/XalanNumberFormat.hpp Wed Dec 12 17:25:38 2007
@@ -117,6 +117,21 @@
unsigned long theValue,
XalanDOMString& theResult);
+#if defined(XALAN_SIZE_T_NOT_STANDARD_TYPE)
+
+ /**
+ * Format a number into a string.
+ *
+ * @param theValue number to format
+ * @param theResult the string result
+ */
+ virtual XalanDOMString&
+ format(
+ size_t theValue,
+ XalanDOMString& theResult);
+
+#endif
+
/**
* Whether groupings are used for numbers, for example, "234,678"
*
Modified: xalan/c/branches/dbertoni/VisualStudioFixup/src/xalanc/TestXPath/TestXPath.cpp
URL: http://svn.apache.org/viewvc/xalan/c/branches/dbertoni/VisualStudioFixup/src/xalanc/TestXPath/TestXPath.cpp?rev=603798&r1=603797&r2=603798&view=diff
==============================================================================
--- xalan/c/branches/dbertoni/VisualStudioFixup/src/xalanc/TestXPath/TestXPath.cpp (original)
+++ xalan/c/branches/dbertoni/VisualStudioFixup/src/xalanc/TestXPath/TestXPath.cpp Wed Dec 12 17:25:38 2007
@@ -1237,7 +1237,7 @@
theBaseURL += theDirectory;
XalanDOMString thetmp(theDirectory, theMemoryManager);
-#if defined(WIN32)
+#if defined(XALAN_WINDOWS)
thetmp.append("\\*");
#else
thetmp.append("/*");
Modified: xalan/c/branches/dbertoni/VisualStudioFixup/src/xalanc/Utils/MsgCreator/MsgCreator.cpp
URL: http://svn.apache.org/viewvc/xalan/c/branches/dbertoni/VisualStudioFixup/src/xalanc/Utils/MsgCreator/MsgCreator.cpp?rev=603798&r1=603797&r2=603798&view=diff
==============================================================================
--- xalan/c/branches/dbertoni/VisualStudioFixup/src/xalanc/Utils/MsgCreator/MsgCreator.cpp (original)
+++ xalan/c/branches/dbertoni/VisualStudioFixup/src/xalanc/Utils/MsgCreator/MsgCreator.cpp Wed Dec 12 17:25:38 2007
@@ -16,6 +16,8 @@
* limitations under the License.
*/
+#include "xalanc/Include/PlatformDefinitions.hpp"
+
#include "ICUResHandler.hpp"
#include "InMemHandler.hpp"
#include "MsgCreator.hpp"
@@ -27,7 +29,7 @@
#include <xercesc/util/TransService.hpp>
#include <cassert>
-#if !defined(NDEBUG) && defined(_MSC_VER)
+#if defined(_DEBUG) && defined(_MSC_VER)
#include <crtdbg.h>
#endif
@@ -37,7 +39,7 @@
XALAN_USING_STD(endl)
static const char* s_pathSeparator =
-#if defined(WINDOWS)
+#if defined(XALAN_WINDOWS)
"\\";
#else
"/";
@@ -257,11 +259,7 @@
{
strcpy(FileName, p.outDir);
- const char* const separator =
- strrchr(FileName, *s_pathSeparator);
-
- if (separator == 0 ||
- *(separator + 1) == '\0')
+ if (FileName[dirLength - 1] != *s_pathSeparator)
{
strcat(FileName, s_pathSeparator);
}
@@ -333,7 +331,7 @@
int main(int argC, char* argV[])
{
-#if !defined(NDEBUG) && defined(_MSC_VER)
+#if defined(_DEBUG) && defined(_MSC_VER)
_CrtSetDbgFlag(_CrtSetDbgFlag(_CRTDBG_REPORT_FLAG) | _CRTDBG_LEAK_CHECK_DF);
_CrtSetReportMode(_CRT_WARN, _CRTDBG_MODE_FILE);
Modified: xalan/c/branches/dbertoni/VisualStudioFixup/src/xalanc/XMLSupport/XMLSupportDefinitions.hpp
URL: http://svn.apache.org/viewvc/xalan/c/branches/dbertoni/VisualStudioFixup/src/xalanc/XMLSupport/XMLSupportDefinitions.hpp?rev=603798&r1=603797&r2=603798&view=diff
==============================================================================
--- xalan/c/branches/dbertoni/VisualStudioFixup/src/xalanc/XMLSupport/XMLSupportDefinitions.hpp (original)
+++ xalan/c/branches/dbertoni/VisualStudioFixup/src/xalanc/XMLSupport/XMLSupportDefinitions.hpp Wed Dec 12 17:25:38 2007
@@ -24,7 +24,7 @@
-#if defined(XALAN_XMLSUPPORT_BUILD_DLL)
+#if defined(XALAN_BUILD_DLL)
#define XALAN_XMLSUPPORT_EXPORT XALAN_PLATFORM_EXPORT
Modified: xalan/c/branches/dbertoni/VisualStudioFixup/src/xalanc/XPath/FunctionSubstring.cpp
URL: http://svn.apache.org/viewvc/xalan/c/branches/dbertoni/VisualStudioFixup/src/xalanc/XPath/FunctionSubstring.cpp?rev=603798&r1=603797&r2=603798&view=diff
==============================================================================
--- xalan/c/branches/dbertoni/VisualStudioFixup/src/xalanc/XPath/FunctionSubstring.cpp (original)
+++ xalan/c/branches/dbertoni/VisualStudioFixup/src/xalanc/XPath/FunctionSubstring.cpp Wed Dec 12 17:25:38 2007
@@ -49,28 +49,51 @@
/*
- * Get the value for the start index (C-style, not XPath).
+ * Get the value for the start index (C-style, not XPath). This
+ * function expects theSecondArgValue to be already rounded.
*/
inline XalanDOMString::size_type
getStartIndex(
double theSecondArgValue,
XalanDOMString::size_type theStringLength)
{
- // We always subtract 1 for C-style index, since XPath indexes from 1.
-
- // Anything less than, or equal to 1 is 0.
- if (theSecondArgValue <= 1 ||
- DoubleSupport::isNaN(theSecondArgValue) == true)
+ // We always subtract 1 for C-style index, since
+ // XPath indexes from 1.
+
+ // If we end up with NaN, INF, or -INF, then no possible index
+ // can be greater than or equal to that, so just return
+ // the start index as the length of the string. That
+ // will result in an empty string, which is what we want.
+ if (DoubleSupport::isNaN(theSecondArgValue) == true ||
+ DoubleSupport::isPositiveInfinity(theSecondArgValue) == true ||
+ DoubleSupport::isNegativeInfinity(theSecondArgValue) == true)
{
- return 0;
+ return theStringLength;
}
- else if (DoubleSupport::isPositiveInfinity(theSecondArgValue) == true)
+ // Anything less than, or equal to 1 is 0.
+ else if (DoubleSupport::lessThanOrEqual(theSecondArgValue, 1) == true)
{
- return theStringLength;
+ assert(DoubleSupport::round(theSecondArgValue) == theSecondArgValue);
+
+ return 0;
}
else
{
- return XalanDOMString::size_type(DoubleSupport::round(theSecondArgValue)) - 1;
+ assert(DoubleSupport::round(theSecondArgValue) == theSecondArgValue);
+
+ // Since we have filtered out anything less than
+ // 1, and any special values, we can do this without
+ // calling DoubleSupport::subtract().
+ const double theResult = theSecondArgValue - 1;
+
+ assert(
+ DoubleSupport::equal(
+ DoubleSupport::subtract(
+ theSecondArgValue,
+ 1),
+ theResult));
+
+ return XalanDOMString::size_type(theResult);
}
}
@@ -82,55 +105,83 @@
inline XalanDOMString::size_type
getSubstringLength(
XalanDOMString::size_type theSourceStringLength,
- XalanDOMString::size_type theStartIndex,
- double theThirdArgValue)
+ XalanDOMString::size_type theStartIndex,
+ double theSecondArgValue,
+ const XObjectPtr& arg3)
{
- // The last index must be less than theThirdArgValue. Since it has
- // already been rounded, subtracting 1 will do the job.
- const XalanDOMString::size_type theLastIndex = XalanDOMString::size_type(theThirdArgValue - 1);
-
- if (theLastIndex >= theSourceStringLength)
- {
- return theSourceStringLength - theStartIndex;
- }
- else
- {
- return theLastIndex - theStartIndex;
- }
-}
+ assert(theStartIndex < theSourceStringLength);
+ assert(DoubleSupport::isNaN(theSecondArgValue) == false);
+ assert(DoubleSupport::isNegativeInfinity(theSecondArgValue) == false);
+ assert(DoubleSupport::isPositiveInfinity(theSecondArgValue) == false);
+ typedef XalanDOMString::size_type size_type;
+ const size_type theMaxLength =
+ theSourceStringLength - theStartIndex;
-/*
- * Get the total of the second and third arguments.
- */
-inline double
-getTotal(
- XalanDOMString::size_type theSourceStringLength,
- double theSecondArgValue,
- const XObjectPtr& arg3)
-{
// Total the second and third arguments. If the third argument is
// missing, make it the length of the string + 1 (for XPath
// indexing style).
if (arg3.null() == true)
{
- return double(theSourceStringLength + 1);
+ return theMaxLength;
}
else
{
- const double theRoundedValue =
- DoubleSupport::round(DoubleSupport::add(theSecondArgValue, arg3->num()));
+ const double theThirdArgValue = arg3->num();
- // If there's overflow, then we should return the length of the string + 1.
- if (DoubleSupport::isPositiveInfinity(theRoundedValue) == true)
- {
- return double(theSourceStringLength + 1);
- }
- else
- {
- return theRoundedValue;
- }
+ if (DoubleSupport::isNaN(theThirdArgValue) == true ||
+ DoubleSupport::isNegativeInfinity(theThirdArgValue) == true)
+ {
+ return 0;
+ }
+ else if (DoubleSupport::isPositiveInfinity(theThirdArgValue) == true)
+ {
+ return theMaxLength;
+ }
+ else
+ {
+ const double theRoundedValue =
+ DoubleSupport::round(theThirdArgValue);
+ assert(DoubleSupport::isNaN(theRoundedValue) == false);
+ assert(DoubleSupport::isNegativeInfinity(theRoundedValue) == false);
+ assert(DoubleSupport::isPositiveInfinity(theRoundedValue) == false);
+
+ // The XPath recommendation states that following:
+ //
+ // http://www.w3.org/TR/xpath#function-substring
+ //
+ // "The returned substring contains those characters for which the
+ // position of the character is greater than or equal to the rounded
+ // value of the second argument and, if the third argument is specified,
+ // less than the sum of the rounded value of the second argument and the
+ // rounded value of the third argument; the comparisons and addition used
+ // for the above follow the standard IEEE 754 rules; rounding is done as
+ // if by a call to the round function."
+ //
+ // Note that this is indexing from 1.
+ const double theTotal =
+ theRoundedValue + theSecondArgValue;
+
+ const size_type theXPathStartIndex =
+ theStartIndex + 1;
+
+ // If the total is less than or equal to
+ // the starting index, or greater
+ // than or equal to the starting index, the
+ // substring is empty.
+ if (theTotal <= theXPathStartIndex)
+ {
+ return 0;
+ }
+ else
+ {
+ const size_type theSubstringLength =
+ size_type(theTotal) - theXPathStartIndex;
+
+ return theSubstringLength > theMaxLength ? theMaxLength : theSubstringLength;
+ }
+ }
}
}
@@ -186,8 +237,9 @@
const double theSecondArgValue =
DoubleSupport::round(arg2->num());
- // XPath indexes from 1, so this is the first XPath index....
- const XalanDOMString::size_type theStartIndex = getStartIndex(theSecondArgValue, theSourceStringLength);
+ // XPath indexes from 1, so this is the first XPath index....
+ const XalanDOMString::size_type theStartIndex =
+ getStartIndex(theSecondArgValue, theSourceStringLength);
if (theStartIndex >= theSourceStringLength)
{
@@ -195,25 +247,22 @@
}
else
{
- const double theTotal =
- getTotal( theSourceStringLength, theSecondArgValue, arg3);
+ assert(DoubleSupport::isNaN(theSecondArgValue) == false);
+ assert(DoubleSupport::isPositiveInfinity(theSecondArgValue) == false);
+
+ const XalanDOMString::size_type theSubstringLength =
+ getSubstringLength(
+ theSourceStringLength,
+ theStartIndex,
+ theSecondArgValue,
+ arg3);
- if (DoubleSupport::isNaN(theSecondArgValue) == true ||
- DoubleSupport::isNaN(theTotal) == true ||
- DoubleSupport::isNegativeInfinity(theTotal) == true ||
- theTotal == 0.0 ||
- theTotal < double(theStartIndex))
+ if (theSubstringLength == 0)
{
return createEmptyString(executionContext);
}
else
{
- const XalanDOMString::size_type theSubstringLength =
- getSubstringLength(
- theSourceStringLength,
- theStartIndex,
- theTotal);
-
XPathExecutionContext::GetAndReleaseCachedString theResult(executionContext);
XalanDOMString& theString = theResult.get();
Modified: xalan/c/branches/dbertoni/VisualStudioFixup/src/xalanc/XPath/XPathDefinitions.hpp
URL: http://svn.apache.org/viewvc/xalan/c/branches/dbertoni/VisualStudioFixup/src/xalanc/XPath/XPathDefinitions.hpp?rev=603798&r1=603797&r2=603798&view=diff
==============================================================================
--- xalan/c/branches/dbertoni/VisualStudioFixup/src/xalanc/XPath/XPathDefinitions.hpp (original)
+++ xalan/c/branches/dbertoni/VisualStudioFixup/src/xalanc/XPath/XPathDefinitions.hpp Wed Dec 12 17:25:38 2007
@@ -24,7 +24,7 @@
-#if defined(XALAN_XPATH_BUILD_DLL)
+#if defined(XALAN_BUILD_DLL)
#define XALAN_XPATH_EXPORT XALAN_PLATFORM_EXPORT
Modified: xalan/c/branches/dbertoni/VisualStudioFixup/src/xalanc/XPathCAPI/XPathCAPI.cpp
URL: http://svn.apache.org/viewvc/xalan/c/branches/dbertoni/VisualStudioFixup/src/xalanc/XPathCAPI/XPathCAPI.cpp?rev=603798&r1=603797&r2=603798&view=diff
==============================================================================
--- xalan/c/branches/dbertoni/VisualStudioFixup/src/xalanc/XPathCAPI/XPathCAPI.cpp (original)
+++ xalan/c/branches/dbertoni/VisualStudioFixup/src/xalanc/XPathCAPI/XPathCAPI.cpp Wed Dec 12 17:25:38 2007
@@ -36,9 +36,7 @@
#include <xalanc/XPath/XObjectFactory.hpp>
#include <xalanc/XPath/XPath.hpp>
-#if defined(XALAN_ALLINONE_BUILD_DLL)
#include <xalanc/XPath/XPathConstructionContextDefault.hpp>
-#endif
#include <xalanc/XPath/XPathEvaluator.hpp>
#include <xalanc/XPath/XPathExecutionContextDefault.hpp>
#include <xalanc/XPath/XPathFactoryDefault.hpp>
---------------------------------------------------------------------
To unsubscribe, e-mail: xalan-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xalan-cvs-help@xml.apache.org