xalan-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dbert...@apache.org
Subject svn commit: r638221 [8/9] - in /xalan/c/trunk: ./ Projects/Win32/Res/AllInOne/ Projects/Win32/VC6/AllInOne/ Projects/Win32/VC6/ApacheModuleXSLT/ Projects/Win32/VC6/CompileStylesheet/ Projects/Win32/VC6/DocumentBuilder/ Projects/Win32/VC6/ExternalFuncti...
Date Tue, 18 Mar 2008 05:31:37 GMT
Modified: xalan/c/trunk/samples/Projects/Win32/VC6/ThreadSafe/ThreadSafe.dsp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/samples/Projects/Win32/VC6/ThreadSafe/ThreadSafe.dsp?rev=638221&r1=638220&r2=638221&view=diff
==============================================================================
--- xalan/c/trunk/samples/Projects/Win32/VC6/ThreadSafe/ThreadSafe.dsp (original)
+++ xalan/c/trunk/samples/Projects/Win32/VC6/ThreadSafe/ThreadSafe.dsp Mon Mar 17 22:31:10 2008
@@ -44,8 +44,8 @@
 # PROP Intermediate_Dir "..\..\..\..\..\bin\ThreadSafe"
 # 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\ThreadSafe"
 # 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\ThreadSafe"
 # 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\ThreadSafe"
 # 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/trunk/samples/Projects/Win32/VC6/TraceListen/TraceListen.dsp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/samples/Projects/Win32/VC6/TraceListen/TraceListen.dsp?rev=638221&r1=638220&r2=638221&view=diff
==============================================================================
--- xalan/c/trunk/samples/Projects/Win32/VC6/TraceListen/TraceListen.dsp (original)
+++ xalan/c/trunk/samples/Projects/Win32/VC6/TraceListen/TraceListen.dsp Mon Mar 17 22:31:10 2008
@@ -44,8 +44,8 @@
 # PROP Intermediate_Dir "..\..\..\..\..\bin\TraceListen"
 # 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\TraceListen"
 # 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\TraceListen"
 # 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\TraceListen"
 # 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/trunk/samples/Projects/Win32/VC6/TransformToXercesDOM/TransformToXercesDOM.dsp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/samples/Projects/Win32/VC6/TransformToXercesDOM/TransformToXercesDOM.dsp?rev=638221&r1=638220&r2=638221&view=diff
==============================================================================
--- xalan/c/trunk/samples/Projects/Win32/VC6/TransformToXercesDOM/TransformToXercesDOM.dsp (original)
+++ xalan/c/trunk/samples/Projects/Win32/VC6/TransformToXercesDOM/TransformToXercesDOM.dsp Mon Mar 17 22:31:10 2008
@@ -44,8 +44,8 @@
 # PROP Intermediate_Dir "..\..\..\..\..\bin\TransformToXercesDOM"
 # 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\TransformToXercesDOM"
 # 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\TransformToXercesDOM"
 # 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\TransformToXercesDOM"
 # 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/trunk/samples/Projects/Win32/VC6/UseStylesheetParam/UseStylesheetParam.dsp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/samples/Projects/Win32/VC6/UseStylesheetParam/UseStylesheetParam.dsp?rev=638221&r1=638220&r2=638221&view=diff
==============================================================================
--- xalan/c/trunk/samples/Projects/Win32/VC6/UseStylesheetParam/UseStylesheetParam.dsp (original)
+++ xalan/c/trunk/samples/Projects/Win32/VC6/UseStylesheetParam/UseStylesheetParam.dsp Mon Mar 17 22:31:10 2008
@@ -44,8 +44,8 @@
 # PROP Intermediate_Dir "..\..\..\..\..\bin\UseStylesheetParam"
 # 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\UseStylesheetParam"
 # 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\UseStylesheetParam"
 # 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\UseStylesheetParam"
 # 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/trunk/samples/Projects/Win32/VC6/XPathWrapper/XPathWrapper.dsp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/samples/Projects/Win32/VC6/XPathWrapper/XPathWrapper.dsp?rev=638221&r1=638220&r2=638221&view=diff
==============================================================================
--- xalan/c/trunk/samples/Projects/Win32/VC6/XPathWrapper/XPathWrapper.dsp (original)
+++ xalan/c/trunk/samples/Projects/Win32/VC6/XPathWrapper/XPathWrapper.dsp Mon Mar 17 22:31:10 2008
@@ -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/trunk/samples/Projects/Win32/VC6/XalanTransform/XalanTransform.dsp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/samples/Projects/Win32/VC6/XalanTransform/XalanTransform.dsp?rev=638221&r1=638220&r2=638221&view=diff
==============================================================================
--- xalan/c/trunk/samples/Projects/Win32/VC6/XalanTransform/XalanTransform.dsp (original)
+++ xalan/c/trunk/samples/Projects/Win32/VC6/XalanTransform/XalanTransform.dsp Mon Mar 17 22:31:10 2008
@@ -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/trunk/samples/Projects/Win32/VC6/XalanTransformerCallback/XalanTransformerCallback.dsp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/samples/Projects/Win32/VC6/XalanTransformerCallback/XalanTransformerCallback.dsp?rev=638221&r1=638220&r2=638221&view=diff
==============================================================================
--- xalan/c/trunk/samples/Projects/Win32/VC6/XalanTransformerCallback/XalanTransformerCallback.dsp (original)
+++ xalan/c/trunk/samples/Projects/Win32/VC6/XalanTransformerCallback/XalanTransformerCallback.dsp Mon Mar 17 22:31:10 2008
@@ -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/trunk/samples/Projects/Win32/VC7.1/ApacheModuleXSLT/ApacheModuleXSLT.vcproj
URL: http://svn.apache.org/viewvc/xalan/c/trunk/samples/Projects/Win32/VC7.1/ApacheModuleXSLT/ApacheModuleXSLT.vcproj?rev=638221&r1=638220&r2=638221&view=diff
==============================================================================
--- xalan/c/trunk/samples/Projects/Win32/VC7.1/ApacheModuleXSLT/ApacheModuleXSLT.vcproj (original)
+++ xalan/c/trunk/samples/Projects/Win32/VC7.1/ApacheModuleXSLT/ApacheModuleXSLT.vcproj Mon Mar 17 22:31:10 2008
@@ -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/trunk/samples/Projects/Win32/VC7.1/CompileStylesheet/CompileStylesheet.vcproj
URL: http://svn.apache.org/viewvc/xalan/c/trunk/samples/Projects/Win32/VC7.1/CompileStylesheet/CompileStylesheet.vcproj?rev=638221&r1=638220&r2=638221&view=diff
==============================================================================
--- xalan/c/trunk/samples/Projects/Win32/VC7.1/CompileStylesheet/CompileStylesheet.vcproj (original)
+++ xalan/c/trunk/samples/Projects/Win32/VC7.1/CompileStylesheet/CompileStylesheet.vcproj Mon Mar 17 22:31:10 2008
@@ -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/trunk/samples/Projects/Win32/VC7.1/DocumentBuilder/DocumentBuilder.vcproj
URL: http://svn.apache.org/viewvc/xalan/c/trunk/samples/Projects/Win32/VC7.1/DocumentBuilder/DocumentBuilder.vcproj?rev=638221&r1=638220&r2=638221&view=diff
==============================================================================
--- xalan/c/trunk/samples/Projects/Win32/VC7.1/DocumentBuilder/DocumentBuilder.vcproj (original)
+++ xalan/c/trunk/samples/Projects/Win32/VC7.1/DocumentBuilder/DocumentBuilder.vcproj Mon Mar 17 22:31:10 2008
@@ -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/trunk/samples/Projects/Win32/VC7.1/ExternalFunction/ExternalFunction.vcproj
URL: http://svn.apache.org/viewvc/xalan/c/trunk/samples/Projects/Win32/VC7.1/ExternalFunction/ExternalFunction.vcproj?rev=638221&r1=638220&r2=638221&view=diff
==============================================================================
--- xalan/c/trunk/samples/Projects/Win32/VC7.1/ExternalFunction/ExternalFunction.vcproj (original)
+++ xalan/c/trunk/samples/Projects/Win32/VC7.1/ExternalFunction/ExternalFunction.vcproj Mon Mar 17 22:31:10 2008
@@ -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/trunk/samples/Projects/Win32/VC7.1/ParsedSourceWrappers/ParsedSourceWrappers.vcproj
URL: http://svn.apache.org/viewvc/xalan/c/trunk/samples/Projects/Win32/VC7.1/ParsedSourceWrappers/ParsedSourceWrappers.vcproj?rev=638221&r1=638220&r2=638221&view=diff
==============================================================================
--- xalan/c/trunk/samples/Projects/Win32/VC7.1/ParsedSourceWrappers/ParsedSourceWrappers.vcproj (original)
+++ xalan/c/trunk/samples/Projects/Win32/VC7.1/ParsedSourceWrappers/ParsedSourceWrappers.vcproj Mon Mar 17 22:31:10 2008
@@ -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/trunk/samples/Projects/Win32/VC7.1/SerializeNodeSet/SerializeNodeSet.vcproj
URL: http://svn.apache.org/viewvc/xalan/c/trunk/samples/Projects/Win32/VC7.1/SerializeNodeSet/SerializeNodeSet.vcproj?rev=638221&r1=638220&r2=638221&view=diff
==============================================================================
--- xalan/c/trunk/samples/Projects/Win32/VC7.1/SerializeNodeSet/SerializeNodeSet.vcproj (original)
+++ xalan/c/trunk/samples/Projects/Win32/VC7.1/SerializeNodeSet/SerializeNodeSet.vcproj Mon Mar 17 22:31:10 2008
@@ -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/trunk/samples/Projects/Win32/VC7.1/SimpleTransform/SimpleTransform.vcproj
URL: http://svn.apache.org/viewvc/xalan/c/trunk/samples/Projects/Win32/VC7.1/SimpleTransform/SimpleTransform.vcproj?rev=638221&r1=638220&r2=638221&view=diff
==============================================================================
--- xalan/c/trunk/samples/Projects/Win32/VC7.1/SimpleTransform/SimpleTransform.vcproj (original)
+++ xalan/c/trunk/samples/Projects/Win32/VC7.1/SimpleTransform/SimpleTransform.vcproj Mon Mar 17 22:31:10 2008
@@ -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/trunk/samples/Projects/Win32/VC7.1/SimpleXPathAPI/SimpleXPathAPI.vcproj
URL: http://svn.apache.org/viewvc/xalan/c/trunk/samples/Projects/Win32/VC7.1/SimpleXPathAPI/SimpleXPathAPI.vcproj?rev=638221&r1=638220&r2=638221&view=diff
==============================================================================
--- xalan/c/trunk/samples/Projects/Win32/VC7.1/SimpleXPathAPI/SimpleXPathAPI.vcproj (original)
+++ xalan/c/trunk/samples/Projects/Win32/VC7.1/SimpleXPathAPI/SimpleXPathAPI.vcproj Mon Mar 17 22:31:10 2008
@@ -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/trunk/samples/Projects/Win32/VC7.1/SimpleXPathCAPI/SimpleXPathCAPI.vcproj
URL: http://svn.apache.org/viewvc/xalan/c/trunk/samples/Projects/Win32/VC7.1/SimpleXPathCAPI/SimpleXPathCAPI.vcproj?rev=638221&r1=638220&r2=638221&view=diff
==============================================================================
--- xalan/c/trunk/samples/Projects/Win32/VC7.1/SimpleXPathCAPI/SimpleXPathCAPI.vcproj (original)
+++ xalan/c/trunk/samples/Projects/Win32/VC7.1/SimpleXPathCAPI/SimpleXPathCAPI.vcproj Mon Mar 17 22:31:10 2008
@@ -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/trunk/samples/Projects/Win32/VC7.1/StreamTransform/StreamTransform.vcproj
URL: http://svn.apache.org/viewvc/xalan/c/trunk/samples/Projects/Win32/VC7.1/StreamTransform/StreamTransform.vcproj?rev=638221&r1=638220&r2=638221&view=diff
==============================================================================
--- xalan/c/trunk/samples/Projects/Win32/VC7.1/StreamTransform/StreamTransform.vcproj (original)
+++ xalan/c/trunk/samples/Projects/Win32/VC7.1/StreamTransform/StreamTransform.vcproj Mon Mar 17 22:31:10 2008
@@ -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/trunk/samples/Projects/Win32/VC7.1/ThreadSafe/ThreadSafe.vcproj
URL: http://svn.apache.org/viewvc/xalan/c/trunk/samples/Projects/Win32/VC7.1/ThreadSafe/ThreadSafe.vcproj?rev=638221&r1=638220&r2=638221&view=diff
==============================================================================
--- xalan/c/trunk/samples/Projects/Win32/VC7.1/ThreadSafe/ThreadSafe.vcproj (original)
+++ xalan/c/trunk/samples/Projects/Win32/VC7.1/ThreadSafe/ThreadSafe.vcproj Mon Mar 17 22:31:10 2008
@@ -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/trunk/samples/Projects/Win32/VC7.1/TraceListen/TraceListen.vcproj
URL: http://svn.apache.org/viewvc/xalan/c/trunk/samples/Projects/Win32/VC7.1/TraceListen/TraceListen.vcproj?rev=638221&r1=638220&r2=638221&view=diff
==============================================================================
--- xalan/c/trunk/samples/Projects/Win32/VC7.1/TraceListen/TraceListen.vcproj (original)
+++ xalan/c/trunk/samples/Projects/Win32/VC7.1/TraceListen/TraceListen.vcproj Mon Mar 17 22:31:10 2008
@@ -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/trunk/samples/Projects/Win32/VC7.1/TransformToXercesDOM/TransformToXercesDOM.vcproj
URL: http://svn.apache.org/viewvc/xalan/c/trunk/samples/Projects/Win32/VC7.1/TransformToXercesDOM/TransformToXercesDOM.vcproj?rev=638221&r1=638220&r2=638221&view=diff
==============================================================================
--- xalan/c/trunk/samples/Projects/Win32/VC7.1/TransformToXercesDOM/TransformToXercesDOM.vcproj (original)
+++ xalan/c/trunk/samples/Projects/Win32/VC7.1/TransformToXercesDOM/TransformToXercesDOM.vcproj Mon Mar 17 22:31:10 2008
@@ -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/trunk/samples/Projects/Win32/VC7.1/UseStylesheetParam/UseStylesheetParam.vcproj
URL: http://svn.apache.org/viewvc/xalan/c/trunk/samples/Projects/Win32/VC7.1/UseStylesheetParam/UseStylesheetParam.vcproj?rev=638221&r1=638220&r2=638221&view=diff
==============================================================================
--- xalan/c/trunk/samples/Projects/Win32/VC7.1/UseStylesheetParam/UseStylesheetParam.vcproj (original)
+++ xalan/c/trunk/samples/Projects/Win32/VC7.1/UseStylesheetParam/UseStylesheetParam.vcproj Mon Mar 17 22:31:10 2008
@@ -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/trunk/samples/Projects/Win32/VC7.1/XPathWrapper/XPathWrapper.vcproj
URL: http://svn.apache.org/viewvc/xalan/c/trunk/samples/Projects/Win32/VC7.1/XPathWrapper/XPathWrapper.vcproj?rev=638221&r1=638220&r2=638221&view=diff
==============================================================================
--- xalan/c/trunk/samples/Projects/Win32/VC7.1/XPathWrapper/XPathWrapper.vcproj (original)
+++ xalan/c/trunk/samples/Projects/Win32/VC7.1/XPathWrapper/XPathWrapper.vcproj Mon Mar 17 22:31:10 2008
@@ -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/trunk/samples/Projects/Win32/VC7.1/XalanTransform/XalanTransform.vcproj
URL: http://svn.apache.org/viewvc/xalan/c/trunk/samples/Projects/Win32/VC7.1/XalanTransform/XalanTransform.vcproj?rev=638221&r1=638220&r2=638221&view=diff
==============================================================================
--- xalan/c/trunk/samples/Projects/Win32/VC7.1/XalanTransform/XalanTransform.vcproj (original)
+++ xalan/c/trunk/samples/Projects/Win32/VC7.1/XalanTransform/XalanTransform.vcproj Mon Mar 17 22:31:10 2008
@@ -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/trunk/samples/Projects/Win32/VC7.1/XalanTransformerCallback/XalanTransformerCallback.vcproj
URL: http://svn.apache.org/viewvc/xalan/c/trunk/samples/Projects/Win32/VC7.1/XalanTransformerCallback/XalanTransformerCallback.vcproj?rev=638221&r1=638220&r2=638221&view=diff
==============================================================================
--- xalan/c/trunk/samples/Projects/Win32/VC7.1/XalanTransformerCallback/XalanTransformerCallback.vcproj (original)
+++ xalan/c/trunk/samples/Projects/Win32/VC7.1/XalanTransformerCallback/XalanTransformerCallback.vcproj Mon Mar 17 22:31:10 2008
@@ -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/trunk/samples/Projects/Win32/VC7/ApacheModuleXSLT/ApacheModuleXSLT.vcproj
URL: http://svn.apache.org/viewvc/xalan/c/trunk/samples/Projects/Win32/VC7/ApacheModuleXSLT/ApacheModuleXSLT.vcproj?rev=638221&r1=638220&r2=638221&view=diff
==============================================================================
--- xalan/c/trunk/samples/Projects/Win32/VC7/ApacheModuleXSLT/ApacheModuleXSLT.vcproj (original)
+++ xalan/c/trunk/samples/Projects/Win32/VC7/ApacheModuleXSLT/ApacheModuleXSLT.vcproj Mon Mar 17 22:31:10 2008
@@ -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/trunk/samples/Projects/Win32/VC7/CompileStylesheet/CompileStylesheet.vcproj
URL: http://svn.apache.org/viewvc/xalan/c/trunk/samples/Projects/Win32/VC7/CompileStylesheet/CompileStylesheet.vcproj?rev=638221&r1=638220&r2=638221&view=diff
==============================================================================
--- xalan/c/trunk/samples/Projects/Win32/VC7/CompileStylesheet/CompileStylesheet.vcproj (original)
+++ xalan/c/trunk/samples/Projects/Win32/VC7/CompileStylesheet/CompileStylesheet.vcproj Mon Mar 17 22:31:10 2008
@@ -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/trunk/samples/Projects/Win32/VC7/DocumentBuilder/DocumentBuilder.vcproj
URL: http://svn.apache.org/viewvc/xalan/c/trunk/samples/Projects/Win32/VC7/DocumentBuilder/DocumentBuilder.vcproj?rev=638221&r1=638220&r2=638221&view=diff
==============================================================================
--- xalan/c/trunk/samples/Projects/Win32/VC7/DocumentBuilder/DocumentBuilder.vcproj (original)
+++ xalan/c/trunk/samples/Projects/Win32/VC7/DocumentBuilder/DocumentBuilder.vcproj Mon Mar 17 22:31:10 2008
@@ -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/trunk/samples/Projects/Win32/VC7/ExternalFunction/ExternalFunction.vcproj
URL: http://svn.apache.org/viewvc/xalan/c/trunk/samples/Projects/Win32/VC7/ExternalFunction/ExternalFunction.vcproj?rev=638221&r1=638220&r2=638221&view=diff
==============================================================================
--- xalan/c/trunk/samples/Projects/Win32/VC7/ExternalFunction/ExternalFunction.vcproj (original)
+++ xalan/c/trunk/samples/Projects/Win32/VC7/ExternalFunction/ExternalFunction.vcproj Mon Mar 17 22:31:10 2008
@@ -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/trunk/samples/Projects/Win32/VC7/ParsedSourceWrappers/ParsedSourceWrappers.vcproj
URL: http://svn.apache.org/viewvc/xalan/c/trunk/samples/Projects/Win32/VC7/ParsedSourceWrappers/ParsedSourceWrappers.vcproj?rev=638221&r1=638220&r2=638221&view=diff
==============================================================================
--- xalan/c/trunk/samples/Projects/Win32/VC7/ParsedSourceWrappers/ParsedSourceWrappers.vcproj (original)
+++ xalan/c/trunk/samples/Projects/Win32/VC7/ParsedSourceWrappers/ParsedSourceWrappers.vcproj Mon Mar 17 22:31:10 2008
@@ -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/trunk/samples/Projects/Win32/VC7/SerializeNodeSet/SerializeNodeSet.vcproj
URL: http://svn.apache.org/viewvc/xalan/c/trunk/samples/Projects/Win32/VC7/SerializeNodeSet/SerializeNodeSet.vcproj?rev=638221&r1=638220&r2=638221&view=diff
==============================================================================
--- xalan/c/trunk/samples/Projects/Win32/VC7/SerializeNodeSet/SerializeNodeSet.vcproj (original)
+++ xalan/c/trunk/samples/Projects/Win32/VC7/SerializeNodeSet/SerializeNodeSet.vcproj Mon Mar 17 22:31:10 2008
@@ -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/trunk/samples/Projects/Win32/VC7/SimpleTransform/SimpleTransform.vcproj
URL: http://svn.apache.org/viewvc/xalan/c/trunk/samples/Projects/Win32/VC7/SimpleTransform/SimpleTransform.vcproj?rev=638221&r1=638220&r2=638221&view=diff
==============================================================================
--- xalan/c/trunk/samples/Projects/Win32/VC7/SimpleTransform/SimpleTransform.vcproj (original)
+++ xalan/c/trunk/samples/Projects/Win32/VC7/SimpleTransform/SimpleTransform.vcproj Mon Mar 17 22:31:10 2008
@@ -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/trunk/samples/Projects/Win32/VC7/SimpleXPathAPI/SimpleXPathAPI.vcproj
URL: http://svn.apache.org/viewvc/xalan/c/trunk/samples/Projects/Win32/VC7/SimpleXPathAPI/SimpleXPathAPI.vcproj?rev=638221&r1=638220&r2=638221&view=diff
==============================================================================
--- xalan/c/trunk/samples/Projects/Win32/VC7/SimpleXPathAPI/SimpleXPathAPI.vcproj (original)
+++ xalan/c/trunk/samples/Projects/Win32/VC7/SimpleXPathAPI/SimpleXPathAPI.vcproj Mon Mar 17 22:31:10 2008
@@ -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/trunk/samples/Projects/Win32/VC7/SimpleXPathCAPI/SimpleXPathCAPI.vcproj
URL: http://svn.apache.org/viewvc/xalan/c/trunk/samples/Projects/Win32/VC7/SimpleXPathCAPI/SimpleXPathCAPI.vcproj?rev=638221&r1=638220&r2=638221&view=diff
==============================================================================
--- xalan/c/trunk/samples/Projects/Win32/VC7/SimpleXPathCAPI/SimpleXPathCAPI.vcproj (original)
+++ xalan/c/trunk/samples/Projects/Win32/VC7/SimpleXPathCAPI/SimpleXPathCAPI.vcproj Mon Mar 17 22:31:10 2008
@@ -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/trunk/samples/Projects/Win32/VC7/StreamTransform/StreamTransform.vcproj
URL: http://svn.apache.org/viewvc/xalan/c/trunk/samples/Projects/Win32/VC7/StreamTransform/StreamTransform.vcproj?rev=638221&r1=638220&r2=638221&view=diff
==============================================================================
--- xalan/c/trunk/samples/Projects/Win32/VC7/StreamTransform/StreamTransform.vcproj (original)
+++ xalan/c/trunk/samples/Projects/Win32/VC7/StreamTransform/StreamTransform.vcproj Mon Mar 17 22:31:10 2008
@@ -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/trunk/samples/Projects/Win32/VC7/ThreadSafe/ThreadSafe.vcproj
URL: http://svn.apache.org/viewvc/xalan/c/trunk/samples/Projects/Win32/VC7/ThreadSafe/ThreadSafe.vcproj?rev=638221&r1=638220&r2=638221&view=diff
==============================================================================
--- xalan/c/trunk/samples/Projects/Win32/VC7/ThreadSafe/ThreadSafe.vcproj (original)
+++ xalan/c/trunk/samples/Projects/Win32/VC7/ThreadSafe/ThreadSafe.vcproj Mon Mar 17 22:31:10 2008
@@ -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/trunk/samples/Projects/Win32/VC7/TraceListen/TraceListen.vcproj
URL: http://svn.apache.org/viewvc/xalan/c/trunk/samples/Projects/Win32/VC7/TraceListen/TraceListen.vcproj?rev=638221&r1=638220&r2=638221&view=diff
==============================================================================
--- xalan/c/trunk/samples/Projects/Win32/VC7/TraceListen/TraceListen.vcproj (original)
+++ xalan/c/trunk/samples/Projects/Win32/VC7/TraceListen/TraceListen.vcproj Mon Mar 17 22:31:10 2008
@@ -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/trunk/samples/Projects/Win32/VC7/TransformToXercesDOM/TransformToXercesDOM.vcproj
URL: http://svn.apache.org/viewvc/xalan/c/trunk/samples/Projects/Win32/VC7/TransformToXercesDOM/TransformToXercesDOM.vcproj?rev=638221&r1=638220&r2=638221&view=diff
==============================================================================
--- xalan/c/trunk/samples/Projects/Win32/VC7/TransformToXercesDOM/TransformToXercesDOM.vcproj (original)
+++ xalan/c/trunk/samples/Projects/Win32/VC7/TransformToXercesDOM/TransformToXercesDOM.vcproj Mon Mar 17 22:31:10 2008
@@ -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/trunk/samples/Projects/Win32/VC7/UseStylesheetParam/UseStylesheetParam.vcproj
URL: http://svn.apache.org/viewvc/xalan/c/trunk/samples/Projects/Win32/VC7/UseStylesheetParam/UseStylesheetParam.vcproj?rev=638221&r1=638220&r2=638221&view=diff
==============================================================================
--- xalan/c/trunk/samples/Projects/Win32/VC7/UseStylesheetParam/UseStylesheetParam.vcproj (original)
+++ xalan/c/trunk/samples/Projects/Win32/VC7/UseStylesheetParam/UseStylesheetParam.vcproj Mon Mar 17 22:31:10 2008
@@ -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/trunk/samples/Projects/Win32/VC7/XPathWrapper/XPathWrapper.vcproj
URL: http://svn.apache.org/viewvc/xalan/c/trunk/samples/Projects/Win32/VC7/XPathWrapper/XPathWrapper.vcproj?rev=638221&r1=638220&r2=638221&view=diff
==============================================================================
--- xalan/c/trunk/samples/Projects/Win32/VC7/XPathWrapper/XPathWrapper.vcproj (original)
+++ xalan/c/trunk/samples/Projects/Win32/VC7/XPathWrapper/XPathWrapper.vcproj Mon Mar 17 22:31:10 2008
@@ -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/trunk/samples/Projects/Win32/VC7/XalanTransform/XalanTransform.vcproj
URL: http://svn.apache.org/viewvc/xalan/c/trunk/samples/Projects/Win32/VC7/XalanTransform/XalanTransform.vcproj?rev=638221&r1=638220&r2=638221&view=diff
==============================================================================
--- xalan/c/trunk/samples/Projects/Win32/VC7/XalanTransform/XalanTransform.vcproj (original)
+++ xalan/c/trunk/samples/Projects/Win32/VC7/XalanTransform/XalanTransform.vcproj Mon Mar 17 22:31:10 2008
@@ -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/trunk/samples/Projects/Win32/VC7/XalanTransformerCallback/XalanTransformerCallback.vcproj
URL: http://svn.apache.org/viewvc/xalan/c/trunk/samples/Projects/Win32/VC7/XalanTransformerCallback/XalanTransformerCallback.vcproj?rev=638221&r1=638220&r2=638221&view=diff
==============================================================================
--- xalan/c/trunk/samples/Projects/Win32/VC7/XalanTransformerCallback/XalanTransformerCallback.vcproj (original)
+++ xalan/c/trunk/samples/Projects/Win32/VC7/XalanTransformerCallback/XalanTransformerCallback.vcproj Mon Mar 17 22:31:10 2008
@@ -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/trunk/samples/SimpleTransform/XalanMemoryManagerImpl.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/samples/SimpleTransform/XalanMemoryManagerImpl.hpp?rev=638221&r1=638220&r2=638221&view=diff
==============================================================================
--- xalan/c/trunk/samples/SimpleTransform/XalanMemoryManagerImpl.hpp (original)
+++ xalan/c/trunk/samples/SimpleTransform/XalanMemoryManagerImpl.hpp Mon Mar 17 22:31:10 2008
@@ -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/trunk/src/xalanc/DOMSupport/DOMSupportDefinitions.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/DOMSupport/DOMSupportDefinitions.hpp?rev=638221&r1=638220&r2=638221&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/DOMSupport/DOMSupportDefinitions.hpp (original)
+++ xalan/c/trunk/src/xalanc/DOMSupport/DOMSupportDefinitions.hpp Mon Mar 17 22:31:10 2008
@@ -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/trunk/src/xalanc/Harness/XalanFileUtility.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/Harness/XalanFileUtility.cpp?rev=638221&r1=638220&r2=638221&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/Harness/XalanFileUtility.cpp (original)
+++ xalan/c/trunk/src/xalanc/Harness/XalanFileUtility.cpp Mon Mar 17 22:31:10 2008
@@ -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)
 {
@@ -386,7 +386,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))
         {
@@ -543,7 +544,7 @@
     if (chdir(theDir))
     {
         //cout << "Couldn't change to " << directory << ", will create it." << endl;
-#if defined(WIN32)
+#if defined(XALAN_WINDOWS)
         if (!mkdir(theDir))
 #else
         if (!mkdir(theDir, DIR_MODE_BITS))
@@ -2087,7 +2088,7 @@
 
 const XalanDOMChar	XalanFileUtility::s_pathSep[] =
 {
-#if defined(WIN32)
+#if defined(XALAN_WINDOWS)
     XalanUnicode::charReverseSolidus,
 #else
     XalanUnicode::charSolidus,

Modified: xalan/c/trunk/src/xalanc/Harness/XalanHarnessDefinitions.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/Harness/XalanHarnessDefinitions.hpp?rev=638221&r1=638220&r2=638221&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/Harness/XalanHarnessDefinitions.hpp (original)
+++ xalan/c/trunk/src/xalanc/Harness/XalanHarnessDefinitions.hpp Mon Mar 17 22:31:10 2008
@@ -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/trunk/src/xalanc/ICUBridge/ICUBridgeDefinitions.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/ICUBridge/ICUBridgeDefinitions.hpp?rev=638221&r1=638220&r2=638221&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/ICUBridge/ICUBridgeDefinitions.hpp (original)
+++ xalan/c/trunk/src/xalanc/ICUBridge/ICUBridgeDefinitions.hpp Mon Mar 17 22:31:10 2008
@@ -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/trunk/src/xalanc/ICUBridge/ICUXalanNumberFormatProxy.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/ICUBridge/ICUXalanNumberFormatProxy.cpp?rev=638221&r1=638220&r2=638221&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/ICUBridge/ICUXalanNumberFormatProxy.cpp (original)
+++ xalan/c/trunk/src/xalanc/ICUBridge/ICUXalanNumberFormatProxy.cpp Mon Mar 17 22:31:10 2008
@@ -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/trunk/src/xalanc/ICUBridge/ICUXalanNumberFormatProxy.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/ICUBridge/ICUXalanNumberFormatProxy.hpp?rev=638221&r1=638220&r2=638221&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/ICUBridge/ICUXalanNumberFormatProxy.hpp (original)
+++ xalan/c/trunk/src/xalanc/ICUBridge/ICUXalanNumberFormatProxy.hpp Mon Mar 17 22:31:10 2008
@@ -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/trunk/src/xalanc/Include/VCPPDefinitions.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/Include/VCPPDefinitions.hpp?rev=638221&r1=638220&r2=638221&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/Include/VCPPDefinitions.hpp (original)
+++ xalan/c/trunk/src/xalanc/Include/VCPPDefinitions.hpp Mon Mar 17 22:31:10 2008
@@ -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/trunk/src/xalanc/PlatformSupport/DOMStringHelper.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/PlatformSupport/DOMStringHelper.cpp?rev=638221&r1=638220&r2=638221&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/PlatformSupport/DOMStringHelper.cpp (original)
+++ xalan/c/trunk/src/xalanc/PlatformSupport/DOMStringHelper.cpp Mon Mar 17 22:31:10 2008
@@ -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/trunk/src/xalanc/PlatformSupport/DOMStringHelper.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/PlatformSupport/DOMStringHelper.hpp?rev=638221&r1=638220&r2=638221&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/PlatformSupport/DOMStringHelper.hpp (original)
+++ xalan/c/trunk/src/xalanc/PlatformSupport/DOMStringHelper.hpp Mon Mar 17 22:31:10 2008
@@ -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/trunk/src/xalanc/PlatformSupport/DoubleSupport.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/PlatformSupport/DoubleSupport.cpp?rev=638221&r1=638220&r2=638221&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/PlatformSupport/DoubleSupport.cpp (original)
+++ xalan/c/trunk/src/xalanc/PlatformSupport/DoubleSupport.cpp Mon Mar 17 22:31:10 2008
@@ -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/trunk/src/xalanc/PlatformSupport/DoubleSupport.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/PlatformSupport/DoubleSupport.hpp?rev=638221&r1=638220&r2=638221&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/PlatformSupport/DoubleSupport.hpp (original)
+++ xalan/c/trunk/src/xalanc/PlatformSupport/DoubleSupport.hpp Mon Mar 17 22:31:10 2008
@@ -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/trunk/src/xalanc/PlatformSupport/PlatformSupportDefinitions.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/PlatformSupport/PlatformSupportDefinitions.hpp?rev=638221&r1=638220&r2=638221&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/PlatformSupport/PlatformSupportDefinitions.hpp (original)
+++ xalan/c/trunk/src/xalanc/PlatformSupport/PlatformSupportDefinitions.hpp Mon Mar 17 22:31:10 2008
@@ -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/trunk/src/xalanc/PlatformSupport/XalanFileOutputStream.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/PlatformSupport/XalanFileOutputStream.cpp?rev=638221&r1=638220&r2=638221&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/PlatformSupport/XalanFileOutputStream.cpp (original)
+++ xalan/c/trunk/src/xalanc/PlatformSupport/XalanFileOutputStream.cpp Mon Mar 17 22:31:10 2008
@@ -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/trunk/src/xalanc/PlatformSupport/XalanFileOutputStream.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/PlatformSupport/XalanFileOutputStream.hpp?rev=638221&r1=638220&r2=638221&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/PlatformSupport/XalanFileOutputStream.hpp (original)
+++ xalan/c/trunk/src/xalanc/PlatformSupport/XalanFileOutputStream.hpp Mon Mar 17 22:31:10 2008
@@ -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/trunk/src/xalanc/PlatformSupport/XalanICUMessageLoader.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/PlatformSupport/XalanICUMessageLoader.cpp?rev=638221&r1=638220&r2=638221&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/PlatformSupport/XalanICUMessageLoader.cpp (original)
+++ xalan/c/trunk/src/xalanc/PlatformSupport/XalanICUMessageLoader.cpp Mon Mar 17 22:31:10 2008
@@ -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/trunk/src/xalanc/PlatformSupport/XalanNumberFormat.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/PlatformSupport/XalanNumberFormat.cpp?rev=638221&r1=638220&r2=638221&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/PlatformSupport/XalanNumberFormat.cpp (original)
+++ xalan/c/trunk/src/xalanc/PlatformSupport/XalanNumberFormat.cpp Mon Mar 17 22:31:10 2008
@@ -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/trunk/src/xalanc/PlatformSupport/XalanNumberFormat.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/PlatformSupport/XalanNumberFormat.hpp?rev=638221&r1=638220&r2=638221&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/PlatformSupport/XalanNumberFormat.hpp (original)
+++ xalan/c/trunk/src/xalanc/PlatformSupport/XalanNumberFormat.hpp Mon Mar 17 22:31:10 2008
@@ -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/trunk/src/xalanc/TestXPath/TestXPath.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/TestXPath/TestXPath.cpp?rev=638221&r1=638220&r2=638221&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/TestXPath/TestXPath.cpp (original)
+++ xalan/c/trunk/src/xalanc/TestXPath/TestXPath.cpp Mon Mar 17 22:31:10 2008
@@ -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/trunk/src/xalanc/Utils/MsgCreator/ICUResHandler.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/Utils/MsgCreator/ICUResHandler.hpp?rev=638221&r1=638220&r2=638221&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/Utils/MsgCreator/ICUResHandler.hpp (original)
+++ xalan/c/trunk/src/xalanc/Utils/MsgCreator/ICUResHandler.hpp Mon Mar 17 22:31:10 2008
@@ -31,10 +31,6 @@
 
 
 
-XERCES_CPP_NAMESPACE_USE
-
-
-
 class ICUResHandler : public SAX2Handler
 {
 public:

Modified: xalan/c/trunk/src/xalanc/Utils/MsgCreator/InMemHandler.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/Utils/MsgCreator/InMemHandler.hpp?rev=638221&r1=638220&r2=638221&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/Utils/MsgCreator/InMemHandler.hpp (original)
+++ xalan/c/trunk/src/xalanc/Utils/MsgCreator/InMemHandler.hpp Mon Mar 17 22:31:10 2008
@@ -31,9 +31,6 @@
 
 
 
-XERCES_CPP_NAMESPACE_USE
-
-
 class InMemHandler : public SAX2Handler
 {
 public:

Modified: xalan/c/trunk/src/xalanc/Utils/MsgCreator/MsgCreator.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/Utils/MsgCreator/MsgCreator.cpp?rev=638221&r1=638220&r2=638221&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/Utils/MsgCreator/MsgCreator.cpp (original)
+++ xalan/c/trunk/src/xalanc/Utils/MsgCreator/MsgCreator.cpp Mon Mar 17 22:31:10 2008
@@ -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/trunk/src/xalanc/Utils/MsgCreator/MsgCreator.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/Utils/MsgCreator/MsgCreator.hpp?rev=638221&r1=638220&r2=638221&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/Utils/MsgCreator/MsgCreator.hpp (original)
+++ xalan/c/trunk/src/xalanc/Utils/MsgCreator/MsgCreator.hpp Mon Mar 17 22:31:10 2008
@@ -47,12 +47,16 @@
     // -----------------------------------------------------------------------
     StrX(const XMLCh* const toTranscode)
     {
+		XALAN_USING_XERCES(XMLString)
+
         // Call the private transcoding method
         fLocalForm = XMLString::transcode(toTranscode);
     }
 
     ~StrX()
     {
+		XALAN_USING_XERCES(XMLString)
+
         XMLString::release(&fLocalForm);
     }
 

Modified: xalan/c/trunk/src/xalanc/Utils/MsgCreator/MsgFileOutputStream.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/Utils/MsgCreator/MsgFileOutputStream.cpp?rev=638221&r1=638220&r2=638221&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/Utils/MsgCreator/MsgFileOutputStream.cpp (original)
+++ xalan/c/trunk/src/xalanc/Utils/MsgCreator/MsgFileOutputStream.cpp Mon Mar 17 22:31:10 2008
@@ -32,6 +32,10 @@
 
 
 
+XALAN_USING_XERCES(XMLString)
+
+
+
 static  MsgFileOutputStream::HandleType
 openFile(const char*    theFileName)
 {

Modified: xalan/c/trunk/src/xalanc/Utils/MsgCreator/SAX2Handler.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/Utils/MsgCreator/SAX2Handler.cpp?rev=638221&r1=638220&r2=638221&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/Utils/MsgCreator/SAX2Handler.cpp (original)
+++ xalan/c/trunk/src/xalanc/Utils/MsgCreator/SAX2Handler.cpp Mon Mar 17 22:31:10 2008
@@ -37,6 +37,10 @@
 
 
 
+XALAN_USING_XERCES(Attributes)
+XALAN_USING_XERCES(SAXParseException)
+XALAN_USING_XERCES(XMLString)
+
 // ---------------------------------------------------------------------------
 //  SAX2Handler: Constructors and Destructor
 // ---------------------------------------------------------------------------

Modified: xalan/c/trunk/src/xalanc/Utils/MsgCreator/SAX2Handler.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/Utils/MsgCreator/SAX2Handler.hpp?rev=638221&r1=638220&r2=638221&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/Utils/MsgCreator/SAX2Handler.hpp (original)
+++ xalan/c/trunk/src/xalanc/Utils/MsgCreator/SAX2Handler.hpp Mon Mar 17 22:31:10 2008
@@ -112,7 +112,7 @@
 // For creation data file responsible subclasses
 
 
-class SAX2Handler : public DefaultHandler
+class SAX2Handler : public XERCES_CPP_NAMESPACE_QUALIFIER DefaultHandler
 {
 public:
     // -----------------------------------------------------------------------
@@ -122,11 +122,13 @@
     virtual ~SAX2Handler();
 
 public:
-    virtual void 
-    startElement(const   XMLCh* const    ,
-                                    const   XMLCh* const    localname,
-                                    const   XMLCh* const    ,
-                                    const   Attributes&     attributes);
+
+    virtual void
+    startElement(
+            const XMLCh* const  uri,
+            const XMLCh* const  localname,
+            const XMLCh* const  qname,
+            const Attributes&   attributes);
 
     virtual void 
     startDocument();



---------------------------------------------------------------------
To unsubscribe, e-mail: xalan-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xalan-cvs-help@xml.apache.org


Mime
View raw message