glacier integration

author: Marc Laukien <marc@zeroc.com> 2002-01-14 21:31:03 +0000
committer: Marc Laukien <marc@zeroc.com> 2002-01-14 21:31:03 +0000
commit: 10a05710b876c4c04072224a62d25a974245d17e (patch)
tree: dcd281feb54d0e72223697e4120ebb69b9a14511
parent: glacier intergration (diff)
download: ice-10a05710b876c4c04072224a62d25a974245d17e.tar.bz2
ice-10a05710b876c4c04072224a62d25a974245d17e.tar.xz
ice-10a05710b876c4c04072224a62d25a974245d17e.zip
89 files changed, 642 insertions, 461 deletions
diff --git a/cpp/demo/Freeze/phonebook/phonebookC.dsp b/cpp/demo/Freeze/phonebook/phonebookC.dsp
index 5c64baaed6b..1c991ed3a1a 100644
--- a/cpp/demo/Freeze/phonebook/phonebookC.dsp
+++ b/cpp/demo/Freeze/phonebook/phonebookC.dsp
@@ -25,7 +25,7 @@ CFG=phonebookC - Win32 Debug
 # PROP AllowPerConfigDependencies 0
 # PROP Scc_ProjName ""
 # PROP Scc_LocalPath ""
-CPP=cl.exe
+CPP=xicl6.exe
 RSC=rc.exe
 
 !IF  "$(CFG)" == "phonebookC - Win32 Release"
@@ -49,9 +49,9 @@ RSC=rc.exe
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
-LINK32=link.exe
+LINK32=xilink6.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 /nologo /subsystem:console /machine:I386 /out:"client.exe" /libpath:"../../../lib"
+# ADD LINK32 /nologo /subsystem:console /machine:I386 /nodefaultlib /out:"client.exe" /libpath:"../../../lib"
 # SUBTRACT LINK32 /debug
 
 !ELSEIF  "$(CFG)" == "phonebookC - Win32 Debug"
@@ -75,9 +75,10 @@ LINK32=link.exe
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
-LINK32=link.exe
+LINK32=xilink6.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
 # ADD LINK32 /nologo /subsystem:console /debug /machine:I386 /out:"client.exe" /pdbtype:sept /libpath:"../../../lib"
+# SUBTRACT LINK32 /nodefaultlib
 
 !ENDIF 
 
diff --git a/cpp/demo/Freeze/phonebook/phonebookCOL.dsp b/cpp/demo/Freeze/phonebook/phonebookCOL.dsp
index d778e8429a7..876cb222fa3 100644
--- a/cpp/demo/Freeze/phonebook/phonebookCOL.dsp
+++ b/cpp/demo/Freeze/phonebook/phonebookCOL.dsp
@@ -25,7 +25,7 @@ CFG=phonebookCOL - Win32 Debug
 # PROP AllowPerConfigDependencies 0
 # PROP Scc_ProjName ""
 # PROP Scc_LocalPath ""
-CPP=cl.exe
+CPP=xicl6.exe
 RSC=rc.exe
 
 !IF  "$(CFG)" == "phonebookCOL - Win32 Release"
@@ -49,9 +49,9 @@ RSC=rc.exe
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
-LINK32=link.exe
+LINK32=xilink6.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 /nologo /subsystem:console /machine:I386 /out:"collocated.exe" /libpath:"../../../lib"
+# ADD LINK32 /nologo /subsystem:console /machine:I386 /nodefaultlib /out:"collocated.exe" /libpath:"../../../lib"
 # SUBTRACT LINK32 /debug
 
 !ELSEIF  "$(CFG)" == "phonebookCOL - Win32 Debug"
@@ -75,9 +75,10 @@ LINK32=link.exe
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
-LINK32=link.exe
+LINK32=xilink6.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
 # ADD LINK32 /nologo /subsystem:console /debug /machine:I386 /out:"collocated.exe" /pdbtype:sept /libpath:"../../../lib"
+# SUBTRACT LINK32 /nodefaultlib
 
 !ENDIF 
 
diff --git a/cpp/demo/Freeze/phonebook/phonebookS.dsp b/cpp/demo/Freeze/phonebook/phonebookS.dsp
index 806f164d2f9..fa331d274eb 100644
--- a/cpp/demo/Freeze/phonebook/phonebookS.dsp
+++ b/cpp/demo/Freeze/phonebook/phonebookS.dsp
@@ -25,7 +25,7 @@ CFG=phonebookS - Win32 Debug
 # PROP AllowPerConfigDependencies 0
 # PROP Scc_ProjName ""
 # PROP Scc_LocalPath ""
-CPP=cl.exe
+CPP=xicl6.exe
 RSC=rc.exe
 
 !IF  "$(CFG)" == "phonebookS - Win32 Release"
@@ -49,9 +49,9 @@ RSC=rc.exe
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
-LINK32=link.exe
+LINK32=xilink6.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 /nologo /subsystem:console /machine:I386 /out:"server.exe" /libpath:"../../../lib"
+# ADD LINK32 /nologo /subsystem:console /machine:I386 /nodefaultlib /out:"server.exe" /libpath:"../../../lib"
 # SUBTRACT LINK32 /debug
 
 !ELSEIF  "$(CFG)" == "phonebookS - Win32 Debug"
@@ -75,9 +75,10 @@ LINK32=link.exe
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
-LINK32=link.exe
+LINK32=xilink6.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
 # ADD LINK32 /nologo /subsystem:console /debug /machine:I386 /out:"server.exe" /pdbtype:sept /libpath:"../../../lib"
+# SUBTRACT LINK32 /nodefaultlib
 
 !ENDIF 
 
diff --git a/cpp/demo/Ice/hello/helloC.dsp b/cpp/demo/Ice/hello/helloC.dsp
index 194a9ebb778..4169bda81b5 100644
--- a/cpp/demo/Ice/hello/helloC.dsp
+++ b/cpp/demo/Ice/hello/helloC.dsp
@@ -25,7 +25,7 @@ CFG=helloC - Win32 Debug
 # PROP AllowPerConfigDependencies 0
 # PROP Scc_ProjName ""
 # PROP Scc_LocalPath ""
-CPP=cl.exe
+CPP=xicl6.exe
 RSC=rc.exe
 
 !IF  "$(CFG)" == "helloC - Win32 Release"
@@ -49,9 +49,9 @@ RSC=rc.exe
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
-LINK32=link.exe
+LINK32=xilink6.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 /nologo /subsystem:console /machine:I386 /out:"client.exe" /libpath:"../../../lib"
+# ADD LINK32 /nologo /subsystem:console /machine:I386 /nodefaultlib /out:"client.exe" /libpath:"../../../lib"
 # SUBTRACT LINK32 /debug
 
 !ELSEIF  "$(CFG)" == "helloC - Win32 Debug"
@@ -75,9 +75,10 @@ LINK32=link.exe
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
-LINK32=link.exe
+LINK32=xilink6.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
 # ADD LINK32 /nologo /subsystem:console /debug /machine:I386 /out:"client.exe" /pdbtype:sept /libpath:"../../../lib"
+# SUBTRACT LINK32 /nodefaultlib
 
 !ENDIF 
 
diff --git a/cpp/demo/Ice/hello/helloS.dsp b/cpp/demo/Ice/hello/helloS.dsp
index 9a789efc893..408ced5e25d 100644
--- a/cpp/demo/Ice/hello/helloS.dsp
+++ b/cpp/demo/Ice/hello/helloS.dsp
@@ -25,7 +25,7 @@ CFG=helloS - Win32 Debug
 # PROP AllowPerConfigDependencies 0
 # PROP Scc_ProjName ""
 # PROP Scc_LocalPath ""
-CPP=cl.exe
+CPP=xicl6.exe
 RSC=rc.exe
 
 !IF  "$(CFG)" == "helloS - Win32 Release"
@@ -49,9 +49,9 @@ RSC=rc.exe
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
-LINK32=link.exe
+LINK32=xilink6.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 /nologo /subsystem:console /machine:I386 /out:"server.exe" /libpath:"../../../lib"
+# ADD LINK32 /nologo /subsystem:console /machine:I386 /nodefaultlib /out:"server.exe" /libpath:"../../../lib"
 # SUBTRACT LINK32 /debug
 
 !ELSEIF  "$(CFG)" == "helloS - Win32 Debug"
@@ -75,9 +75,10 @@ LINK32=link.exe
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
-LINK32=link.exe
+LINK32=xilink6.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
 # ADD LINK32 /nologo /subsystem:console /debug /machine:I386 /out:"server.exe" /pdbtype:sept /libpath:"../../../lib"
+# SUBTRACT LINK32 /nodefaultlib
 
 !ENDIF 
 
diff --git a/cpp/demo/Ice/latency/latencyC.dsp b/cpp/demo/Ice/latency/latencyC.dsp
index cc65668d70b..bdcce030ca8 100644
--- a/cpp/demo/Ice/latency/latencyC.dsp
+++ b/cpp/demo/Ice/latency/latencyC.dsp
@@ -25,7 +25,7 @@ CFG=latencyC - Win32 Debug
 # PROP AllowPerConfigDependencies 0
 # PROP Scc_ProjName ""
 # PROP Scc_LocalPath ""
-CPP=cl.exe
+CPP=xicl6.exe
 RSC=rc.exe
 
 !IF  "$(CFG)" == "latencyC - Win32 Release"
@@ -49,9 +49,9 @@ RSC=rc.exe
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
-LINK32=link.exe
+LINK32=xilink6.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 /nologo /subsystem:console /machine:I386 /out:"client.exe" /libpath:"../../../lib"
+# ADD LINK32 /nologo /subsystem:console /machine:I386 /nodefaultlib /out:"client.exe" /libpath:"../../../lib"
 # SUBTRACT LINK32 /debug
 
 !ELSEIF  "$(CFG)" == "latencyC - Win32 Debug"
@@ -75,9 +75,10 @@ LINK32=link.exe
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
-LINK32=link.exe
+LINK32=xilink6.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
 # ADD LINK32 /nologo /subsystem:console /debug /machine:I386 /out:"client.exe" /pdbtype:sept /libpath:"../../../lib"
+# SUBTRACT LINK32 /nodefaultlib
 
 !ENDIF 
 
diff --git a/cpp/demo/Ice/latency/latencyS.dsp b/cpp/demo/Ice/latency/latencyS.dsp
index 57f847e384c..c7c54484c87 100644
--- a/cpp/demo/Ice/latency/latencyS.dsp
+++ b/cpp/demo/Ice/latency/latencyS.dsp
@@ -25,7 +25,7 @@ CFG=latencyS - Win32 Debug
 # PROP AllowPerConfigDependencies 0
 # PROP Scc_ProjName ""
 # PROP Scc_LocalPath ""
-CPP=cl.exe
+CPP=xicl6.exe
 RSC=rc.exe
 
 !IF  "$(CFG)" == "latencyS - Win32 Release"
@@ -49,9 +49,9 @@ RSC=rc.exe
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
-LINK32=link.exe
+LINK32=xilink6.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 /nologo /subsystem:console /machine:I386 /out:"server.exe" /libpath:"../../../lib"
+# ADD LINK32 /nologo /subsystem:console /machine:I386 /nodefaultlib /out:"server.exe" /libpath:"../../../lib"
 # SUBTRACT LINK32 /debug
 
 !ELSEIF  "$(CFG)" == "latencyS - Win32 Debug"
@@ -75,9 +75,10 @@ LINK32=link.exe
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
-LINK32=link.exe
+LINK32=xilink6.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
 # ADD LINK32 /nologo /subsystem:console /debug /machine:I386 /out:"server.exe" /pdbtype:sept /libpath:"../../../lib"
+# SUBTRACT LINK32 /nodefaultlib
 
 !ENDIF 
 
diff --git a/cpp/demo/Ice/nested/Server.cpp b/cpp/demo/Ice/nested/Server.cpp
index 08cb3aff939..f8c471eb684 100644
--- a/cpp/demo/Ice/nested/Server.cpp
+++ b/cpp/demo/Ice/nested/Server.cpp
@@ -25,7 +25,7 @@ int
 main(int argc, char* argv[])
 {
     NestedServer app;
-    return app.main(argc, argv, "config");
+    return app.main(argc, argv, "config.server");
 }
 
 int
diff --git a/cpp/demo/Ice/nested/config b/cpp/demo/Ice/nested/config
index a5b5ad08eea..561b2e86cea 100644
--- a/cpp/demo/Ice/nested/config
+++ b/cpp/demo/Ice/nested/config
@@ -1,9 +1,8 @@
 Nested.NestedServer=nestedServer:default -p 10000 -t 1000
-Ice.Adapter.NestedServerAdapter.Endpoints=default -p 10000 -t 1000
 Ice.Adapter.NestedClientAdapter.Endpoints=default -t 1000
 
-Ice.ThreadPool.Size=5
-#Ice.Trace.Network=3
+Ice.ThreadPool.Size=10
+Ice.Trace.Network=1
 #Ice.Trace.Protocol=1
 #Ice.ConnectionWarnings=1
 
@@ -16,5 +15,5 @@ Glacier.Server.Endpoints=default -p 10011
 Glacier.Trace.Client=1
 Glacier.Trace.Server=1
 Ice.DefaultRouter=router:default -p 10005
-Ice.Adapter.NestedServerAdapter.Router=router:default -p 10005
-Ice.Adapter.NestedServerAdapter.Endpoints=
+Ice.Adapter.NestedClientAdapter.Router=router:default -p 10005
+Ice.Adapter.NestedClientAdapter.Endpoints=
diff --git a/cpp/demo/Ice/nested/config.server b/cpp/demo/Ice/nested/config.server
new file mode 100644
index 00000000000..f47a28cd328
--- /dev/null
+++ b/cpp/demo/Ice/nested/config.server
@@ -0,0 +1,9 @@
+Ice.Adapter.NestedServerAdapter.Endpoints=default -p 10000 -t 1000
+
+Ice.ThreadPool.Size=10
+Ice.Trace.Network=1
+#Ice.Trace.Protocol=1
+#Ice.ConnectionWarnings=1
+
+Ice.Security.Ssl.CertPath=../../../Certs
+Ice.Security.Ssl.Config=sslconfig.xml
diff --git a/cpp/demo/Ice/nested/nestedC.dsp b/cpp/demo/Ice/nested/nestedC.dsp
index f6b25558c05..e3b06dca00b 100644
--- a/cpp/demo/Ice/nested/nestedC.dsp
+++ b/cpp/demo/Ice/nested/nestedC.dsp
@@ -25,7 +25,7 @@ CFG=nestedC - Win32 Debug
 # PROP AllowPerConfigDependencies 0
 # PROP Scc_ProjName ""
 # PROP Scc_LocalPath ""
-CPP=cl.exe
+CPP=xicl6.exe
 RSC=rc.exe
 
 !IF  "$(CFG)" == "nestedC - Win32 Release"
@@ -49,9 +49,9 @@ RSC=rc.exe
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
-LINK32=link.exe
+LINK32=xilink6.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 /nologo /subsystem:console /machine:I386 /out:"client.exe" /libpath:"../../../lib"
+# ADD LINK32 /nologo /subsystem:console /machine:I386 /nodefaultlib /out:"client.exe" /libpath:"../../../lib"
 # SUBTRACT LINK32 /debug
 
 !ELSEIF  "$(CFG)" == "nestedC - Win32 Debug"
@@ -75,9 +75,10 @@ LINK32=link.exe
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
-LINK32=link.exe
+LINK32=xilink6.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
 # ADD LINK32 /nologo /subsystem:console /debug /machine:I386 /out:"client.exe" /pdbtype:sept /libpath:"../../../lib"
+# SUBTRACT LINK32 /nodefaultlib
 
 !ENDIF 
 
diff --git a/cpp/demo/Ice/nested/nestedS.dsp b/cpp/demo/Ice/nested/nestedS.dsp
index 985d8f3b624..e158788f177 100644
--- a/cpp/demo/Ice/nested/nestedS.dsp
+++ b/cpp/demo/Ice/nested/nestedS.dsp
@@ -25,7 +25,7 @@ CFG=nestedS - Win32 Debug
 # PROP AllowPerConfigDependencies 0
 # PROP Scc_ProjName ""
 # PROP Scc_LocalPath ""
-CPP=cl.exe
+CPP=xicl6.exe
 RSC=rc.exe
 
 !IF  "$(CFG)" == "nestedS - Win32 Release"
@@ -49,9 +49,9 @@ RSC=rc.exe
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
-LINK32=link.exe
+LINK32=xilink6.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 /nologo /subsystem:console /machine:I386 /out:"server.exe" /libpath:"../../../lib"
+# ADD LINK32 /nologo /subsystem:console /machine:I386 /nodefaultlib /out:"server.exe" /libpath:"../../../lib"
 # SUBTRACT LINK32 /debug
 
 !ELSEIF  "$(CFG)" == "nestedS - Win32 Debug"
@@ -75,9 +75,10 @@ LINK32=link.exe
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
-LINK32=link.exe
+LINK32=xilink6.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
 # ADD LINK32 /nologo /subsystem:console /debug /machine:I386 /out:"server.exe" /pdbtype:sept /libpath:"../../../lib"
+# SUBTRACT LINK32 /nodefaultlib
 
 !ENDIF 
 
diff --git a/cpp/demo/Ice/value/valueC.dsp b/cpp/demo/Ice/value/valueC.dsp
index 3c31d6607be..784da0b8194 100644
--- a/cpp/demo/Ice/value/valueC.dsp
+++ b/cpp/demo/Ice/value/valueC.dsp
@@ -25,7 +25,7 @@ CFG=valueC - Win32 Debug
 # PROP AllowPerConfigDependencies 0
 # PROP Scc_ProjName ""
 # PROP Scc_LocalPath ""
-CPP=cl.exe
+CPP=xicl6.exe
 RSC=rc.exe
 
 !IF  "$(CFG)" == "valueC - Win32 Release"
@@ -49,9 +49,9 @@ RSC=rc.exe
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
-LINK32=link.exe
+LINK32=xilink6.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 /nologo /subsystem:console /machine:I386 /out:"client.exe" /libpath:"../../../lib"
+# ADD LINK32 /nologo /subsystem:console /machine:I386 /nodefaultlib /out:"client.exe" /libpath:"../../../lib"
 # SUBTRACT LINK32 /debug
 
 !ELSEIF  "$(CFG)" == "valueC - Win32 Debug"
@@ -75,9 +75,10 @@ LINK32=link.exe
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
-LINK32=link.exe
+LINK32=xilink6.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
 # ADD LINK32 /nologo /subsystem:console /debug /machine:I386 /out:"client.exe" /pdbtype:sept /libpath:"../../../lib"
+# SUBTRACT LINK32 /nodefaultlib
 
 !ENDIF 
 
diff --git a/cpp/demo/Ice/value/valueS.dsp b/cpp/demo/Ice/value/valueS.dsp
index b36efd8f02a..60c1a5a760b 100644
--- a/cpp/demo/Ice/value/valueS.dsp
+++ b/cpp/demo/Ice/value/valueS.dsp
@@ -25,7 +25,7 @@ CFG=valueS - Win32 Debug
 # PROP AllowPerConfigDependencies 0
 # PROP Scc_ProjName ""
 # PROP Scc_LocalPath ""
-CPP=cl.exe
+CPP=xicl6.exe
 RSC=rc.exe
 
 !IF  "$(CFG)" == "valueS - Win32 Release"
@@ -49,9 +49,9 @@ RSC=rc.exe
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
-LINK32=link.exe
+LINK32=xilink6.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 /nologo /subsystem:console /machine:I386 /out:"server.exe" /libpath:"../../../lib"
+# ADD LINK32 /nologo /subsystem:console /machine:I386 /nodefaultlib /out:"server.exe" /libpath:"../../../lib"
 # SUBTRACT LINK32 /debug
 
 !ELSEIF  "$(CFG)" == "valueS - Win32 Debug"
@@ -75,9 +75,10 @@ LINK32=link.exe
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
-LINK32=link.exe
+LINK32=xilink6.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
 # ADD LINK32 /nologo /subsystem:console /debug /machine:I386 /out:"server.exe" /pdbtype:sept /libpath:"../../../lib"
+# SUBTRACT LINK32 /nodefaultlib
 
 !ENDIF 
 
diff --git a/cpp/demo/IceStorm/clock/clockC.dsp b/cpp/demo/IceStorm/clock/clockC.dsp
index cbd6c513619..2922c3d8501 100644
--- a/cpp/demo/IceStorm/clock/clockC.dsp
+++ b/cpp/demo/IceStorm/clock/clockC.dsp
@@ -25,7 +25,7 @@ CFG=clockC - Win32 Debug
 # PROP AllowPerConfigDependencies 0
 # PROP Scc_ProjName ""
 # PROP Scc_LocalPath ""
-CPP=cl.exe
+CPP=xicl6.exe
 RSC=rc.exe
 
 !IF  "$(CFG)" == "clockC - Win32 Release"
@@ -49,9 +49,9 @@ RSC=rc.exe
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
-LINK32=link.exe
+LINK32=xilink6.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 /nologo /subsystem:console /machine:I386 /out:"client.exe" /libpath:"../../../lib"
+# ADD LINK32 /nologo /subsystem:console /machine:I386 /nodefaultlib /out:"client.exe" /libpath:"../../../lib"
 # SUBTRACT LINK32 /debug
 
 !ELSEIF  "$(CFG)" == "clockC - Win32 Debug"
@@ -75,9 +75,10 @@ LINK32=link.exe
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
-LINK32=link.exe
+LINK32=xilink6.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
 # ADD LINK32 /nologo /subsystem:console /debug /machine:I386 /out:"publisher.exe" /pdbtype:sept /libpath:"../../../lib"
+# SUBTRACT LINK32 /nodefaultlib
 
 !ENDIF 
 
diff --git a/cpp/demo/IceStorm/clock/clockS.dsp b/cpp/demo/IceStorm/clock/clockS.dsp
index fdea1232909..7be762e2a9c 100644
--- a/cpp/demo/IceStorm/clock/clockS.dsp
+++ b/cpp/demo/IceStorm/clock/clockS.dsp
@@ -25,7 +25,7 @@ CFG=clockS - Win32 Debug
 # PROP AllowPerConfigDependencies 0
 # PROP Scc_ProjName ""
 # PROP Scc_LocalPath ""
-CPP=cl.exe
+CPP=xicl6.exe
 RSC=rc.exe
 
 !IF  "$(CFG)" == "clockS - Win32 Release"
@@ -49,9 +49,9 @@ RSC=rc.exe
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
-LINK32=link.exe
+LINK32=xilink6.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 /nologo /subsystem:console /machine:I386 /out:"server.exe" /libpath:"../../../lib"
+# ADD LINK32 /nologo /subsystem:console /machine:I386 /nodefaultlib /out:"server.exe" /libpath:"../../../lib"
 # SUBTRACT LINK32 /debug
 
 !ELSEIF  "$(CFG)" == "clockS - Win32 Debug"
@@ -75,9 +75,10 @@ LINK32=link.exe
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
-LINK32=link.exe
+LINK32=xilink6.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
 # ADD LINK32 /nologo /subsystem:console /debug /machine:I386 /out:"subscriber.exe" /pdbtype:sept /libpath:"../../../lib"
+# SUBTRACT LINK32 /nodefaultlib
 
 !ENDIF 
 
diff --git a/cpp/include/IceUtil/Shared.h b/cpp/include/IceUtil/Shared.h
index 1694ce7956e..c323cfbfbfc 100644
--- a/cpp/include/IceUtil/Shared.h
+++ b/cpp/include/IceUtil/Shared.h
@@ -87,9 +87,9 @@ static inline int ice_atomic_dec_and_test(ice_atomic_t *v)
 
 /**
  * ice_atomic_exchange_add - same as InterlockedExchangeAdd. This didn't
- * come from ice_atomic.h (the code was derived from similar code in
+ * come from atomic.h (the code was derived from similar code in
  * /usr/include/asm/rwsem.h)
- **/
+ */
 static inline int ice_atomic_exchange_add(int i, ice_atomic_t* v)
 {
     int tmp = i;
@@ -284,7 +284,7 @@ Shared::__decRef()
 inline int
 Shared::__getRef() const
 {
-    return InterlockedExchangeAdd(const_cast<ice_atomic_t*>(&_ref), 0);
+    return InterlockedExchangeAdd(const_cast<LONG*>(&_ref), 0);
 }
 
 inline void
diff --git a/cpp/src/Freeze/freeze.dsp b/cpp/src/Freeze/freeze.dsp
index 4d9a8481d6c..8515e65429c 100644
--- a/cpp/src/Freeze/freeze.dsp
+++ b/cpp/src/Freeze/freeze.dsp
@@ -25,7 +25,7 @@ CFG=Freeze - Win32 Debug
 # PROP AllowPerConfigDependencies 0
 # PROP Scc_ProjName ""
 # PROP Scc_LocalPath ""
-CPP=cl.exe
+CPP=xicl6.exe
 MTL=midl.exe
 RSC=rc.exe
 
@@ -52,9 +52,9 @@ RSC=rc.exe
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
-LINK32=link.exe
+LINK32=xilink6.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 libdb33.lib /nologo /dll /machine:I386 /out:"Release/freeze001.dll" /libpath:"../../../lib"
+# ADD LINK32 libdb33.lib /nologo /dll /machine:I386 /nodefaultlib /out:"Release/freeze001.dll" /libpath:"../../../lib"
 # SUBTRACT LINK32 /pdb:none /debug
 # Begin Special Build Tool
 SOURCE="$(InputPath)"
@@ -84,10 +84,10 @@ PostBuild_Cmds=copy Release\freeze001.* ..\..\lib
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
-LINK32=link.exe
+LINK32=xilink6.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
 # ADD LINK32 libdb33d.lib /nologo /dll /debug /machine:I386 /out:"Debug/freeze001d.dll" /pdbtype:sept /libpath:"../../../lib"
-# SUBTRACT LINK32 /pdb:none
+# SUBTRACT LINK32 /pdb:none /nodefaultlib
 # Begin Special Build Tool
 SOURCE="$(InputPath)"
 PostBuild_Cmds=copy Debug\freeze001d.* ..\..\lib
diff --git a/cpp/src/Glacier/glacierrouter.dsp b/cpp/src/Glacier/glacierrouter.dsp
index 36ffcf81644..ee73e9b6820 100644
--- a/cpp/src/Glacier/glacierrouter.dsp
+++ b/cpp/src/Glacier/glacierrouter.dsp
@@ -25,7 +25,7 @@ CFG=GlacierRouter - Win32 Debug
 # PROP AllowPerConfigDependencies 0
 # PROP Scc_ProjName ""
 # PROP Scc_LocalPath ""
-CPP=cl.exe
+CPP=xicl6.exe
 RSC=rc.exe
 
 !IF  "$(CFG)" == "GlacierRouter - Win32 Release"
@@ -49,9 +49,9 @@ RSC=rc.exe
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
-LINK32=link.exe
+LINK32=xilink6.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 /nologo /subsystem:console /machine:I386 /out:"C:\marc\ice\bin\glacier.exe" /libpath:"../../../lib"
+# ADD LINK32 /nologo /subsystem:console /machine:I386 /nodefaultlib /out:"C:\marc\ice\bin\glacier.exe" /libpath:"../../../lib"
 
 !ELSEIF  "$(CFG)" == "GlacierRouter - Win32 Debug"
 
@@ -74,9 +74,10 @@ LINK32=link.exe
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
-LINK32=link.exe
+LINK32=xilink6.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
 # ADD LINK32 /nologo /subsystem:console /debug /machine:I386 /out:"C:\marc\ice\bin\glacier.exe" /pdbtype:sept /libpath:"../../../lib"
+# SUBTRACT LINK32 /nodefaultlib
 
 !ENDIF 
 
@@ -99,6 +100,10 @@ SOURCE=.\GlacierRouter.cpp
 
 SOURCE=.\RouterI.cpp
 # End Source File
+# Begin Source File
+
+SOURCE=.\ServerBlobject.cpp
+# End Source File
 # End Group
 # Begin Group "Header Files"
 
@@ -111,6 +116,10 @@ SOURCE=.\ClientBlobject.h
 
 SOURCE=.\RouterI.h
 # End Source File
+# Begin Source File
+
+SOURCE=.\ServerBlobject.h
+# End Source File
 # End Group
 # Begin Group "Resource Files"
 
diff --git a/cpp/src/Ice/AcceptorF.h b/cpp/src/Ice/AcceptorF.h
index 153f513a6e5..9cadc0b09dd 100644
--- a/cpp/src/Ice/AcceptorF.h
+++ b/cpp/src/Ice/AcceptorF.h
@@ -19,7 +19,7 @@ namespace IceInternal
 class Acceptor;
 void incRef(Acceptor*);
 void decRef(Acceptor*);
-typedef IceInternal::Handle<Acceptor> AcceptorPtr;
+typedef Handle<Acceptor> AcceptorPtr;
 
 }
 
diff --git a/cpp/src/Ice/ConnectorF.h b/cpp/src/Ice/ConnectorF.h
index a46df2ce057..9b88ca55763 100644
--- a/cpp/src/Ice/ConnectorF.h
+++ b/cpp/src/Ice/ConnectorF.h
@@ -19,7 +19,7 @@ namespace IceInternal
 class Connector;
 void incRef(Connector*);
 void decRef(Connector*);
-typedef IceInternal::Handle<Connector> ConnectorPtr;
+typedef Handle<Connector> ConnectorPtr;
 
 }
 
diff --git a/cpp/src/Ice/Endpoint.cpp b/cpp/src/Ice/Endpoint.cpp
index 699311c72c3..ae1876d9f6e 100644
--- a/cpp/src/Ice/Endpoint.cpp
+++ b/cpp/src/Ice/Endpoint.cpp
@@ -17,7 +17,7 @@
 #include <Ice/SslConnector.h>
 #include <Ice/SslTransceiver.h>
 #include <Ice/UdpTransceiver.h>
-#include <Ice/SUdpTransceiver.h>
+//#include <Ice/SUdpTransceiver.h>
 #include <Ice/BasicStream.h>
 #include <Ice/Exception.h>
 #include <Ice/Instance.h>
@@ -32,7 +32,7 @@ void IceInternal::decRef(Endpoint* p) { p->__decRef(); }
 EndpointPtr
 IceInternal::Endpoint::endpointFromString(const InstancePtr& instance, const string& str)
 {
-    const string delim = " \t\n\r";
+    static const string delim = " \t\n\r";
 
     string::size_type beg = str.find_first_not_of(delim);
     if (beg == string::npos)
@@ -70,7 +70,8 @@ IceInternal::Endpoint::endpointFromString(const InstancePtr& instance, const str
 
     if (protocol == "sudp")
     {
-	return new SUdpEndpoint(instance, str.substr(end));
+//	return new SUdpEndpoint(instance, str.substr(end));
+	return new UdpEndpoint(instance, str.substr(end));
     }
 
     throw EndpointParseException(__FILE__, __LINE__);
@@ -104,7 +105,8 @@ IceInternal::Endpoint::streamRead(BasicStream* s, EndpointPtr& v)
 
 	case SUdpEndpointType:
 	{
-	    v = new SUdpEndpoint(s);
+	    v = new UdpEndpoint(s);
+//	    v = new SUdpEndpoint(s);
 	    break;
 	}
 
@@ -270,7 +272,7 @@ IceInternal::TcpEndpoint::TcpEndpoint(const InstancePtr& instance, const string&
     _port(0),
     _timeout(-1)
 {
-    const string delim = " \t\n\r";
+    static const string delim = " \t\n\r";
 
     string::size_type beg;
     string::size_type end = 0;
@@ -526,10 +528,12 @@ IceInternal::TcpEndpoint::operator<(const Endpoint& r) const
 	    return false; // tcp is not "less than" udp
 	}
 
+/*
 	if (dynamic_cast<const SUdpEndpoint*>(&r))
 	{
 	    return false; // tcp is not "less than" sudp
 	}
+*/
 
 	if (dynamic_cast<const UnknownEndpoint*>(&r))
 	{
@@ -591,7 +595,7 @@ IceInternal::SslEndpoint::SslEndpoint(const InstancePtr& instance, const string&
     _port(0),
     _timeout(-1)
 {
-    const string delim = " \t\n\r";
+    static const string delim = " \t\n\r";
 
     string::size_type beg;
     string::size_type end = 0;
@@ -833,10 +837,12 @@ IceInternal::SslEndpoint::operator<(const Endpoint& r) const
 	    return false; // ssl is not "less than" udp
 	}
 
+/*
 	if (dynamic_cast<const SUdpEndpoint*>(&r))
 	{
 	    return false; // ssl is not "less than" sudp
 	}
+*/
 
 	if (dynamic_cast<const UnknownEndpoint*>(&r))
 	{
@@ -896,7 +902,7 @@ IceInternal::UdpEndpoint::UdpEndpoint(const InstancePtr& instance, const string&
     _instance(instance),
     _port(0)
 {
-    const string delim = " \t\n\r";
+    static const string delim = " \t\n\r";
 
     string::size_type beg;
     string::size_type end = 0;
@@ -1117,10 +1123,12 @@ IceInternal::UdpEndpoint::operator<(const Endpoint& r) const
 	    return true; // udp is "less than" tcp
 	}
 
+/*
 	if (dynamic_cast<const SUdpEndpoint*>(&r))
 	{
 	    return false; // udp is not "less than" sudp
 	}
+*/
 
 	if (dynamic_cast<const UnknownEndpoint*>(&r))
 	{
@@ -1160,8 +1168,6 @@ IceInternal::UdpEndpoint::operator<(const Endpoint& r) const
     return false;
 }
 
-///////////////////////////////////////
-
 IceInternal::SUdpEndpoint::SUdpEndpoint(const InstancePtr& instance, const string& ho, Int po) :
     _instance(instance),
     _host(ho),
@@ -1173,7 +1179,7 @@ IceInternal::SUdpEndpoint::SUdpEndpoint(const InstancePtr& instance, const strin
     _instance(instance),
     _port(0)
 {
-    const string delim = " \t\n\r";
+    static const string delim = " \t\n\r";
 
     string::size_type beg;
     string::size_type end = 0;
@@ -1300,13 +1306,15 @@ IceInternal::SUdpEndpoint::secure() const
 TransceiverPtr
 IceInternal::SUdpEndpoint::clientTransceiver() const
 {
-    return new SUdpTransceiver(_instance, _host, _port);
+//    return new SUdpTransceiver(_instance, _host, _port);
+    return new UdpTransceiver(_instance, _host, _port);
 }
 
 TransceiverPtr
 IceInternal::SUdpEndpoint::serverTransceiver(EndpointPtr& endp) const
 {
-    SUdpTransceiver* p = new SUdpTransceiver(_instance, _port);
+//    SUdpTransceiver* p = new SUdpTransceiver(_instance, _port);
+    UdpTransceiver* p = new UdpTransceiver(_instance, _port);
     endp = new SUdpEndpoint(_instance, _host, p->effectivePort());
     return p;
 }
@@ -1327,7 +1335,9 @@ IceInternal::SUdpEndpoint::acceptor(EndpointPtr& endp) const
 bool
 IceInternal::SUdpEndpoint::equivalent(const TransceiverPtr& transceiver) const
 {
-    const SUdpTransceiver* sudpTransceiver = dynamic_cast<const SUdpTransceiver*>(transceiver.get());
+//    const SUdpTransceiver* sudpTransceiver = dynamic_cast<const SUdpTransceiver*>(transceiver.get());
+//    if (!sudpTransceiver)
+    const UdpTransceiver* sudpTransceiver = dynamic_cast<const UdpTransceiver*>(transceiver.get());
     if (!sudpTransceiver)
     {
 	return false;
diff --git a/cpp/src/Ice/Endpoint.h b/cpp/src/Ice/Endpoint.h
index 9c99f16eca5..1eebf4e3d75 100644
--- a/cpp/src/Ice/Endpoint.h
+++ b/cpp/src/Ice/Endpoint.h
@@ -304,6 +304,7 @@ private:
     const std::string _host;
     const ::Ice::Int _port;
 };
+
 }
 
 #endif
diff --git a/cpp/src/Ice/EventHandlerF.h b/cpp/src/Ice/EventHandlerF.h
index 1a82dc6d437..32a1379edfd 100644
--- a/cpp/src/Ice/EventHandlerF.h
+++ b/cpp/src/Ice/EventHandlerF.h
@@ -19,7 +19,7 @@ namespace IceInternal
 class EventHandler;
 void incRef(EventHandler*);
 void decRef(EventHandler*);
-typedef IceInternal::Handle<EventHandler> EventHandlerPtr;
+typedef Handle<EventHandler> EventHandlerPtr;
 
 }
 
diff --git a/cpp/src/Ice/ObjectAdapterI.cpp b/cpp/src/Ice/ObjectAdapterI.cpp
index 296a57cfcf4..232fb1adfd1 100644
--- a/cpp/src/Ice/ObjectAdapterI.cpp
+++ b/cpp/src/Ice/ObjectAdapterI.cpp
@@ -381,14 +381,22 @@ Ice::ObjectAdapterI::ObjectAdapterI(const InstancePtr& instance, const string& n
     string s(endpts);
     transform(s.begin(), s.end(), s.begin(), tolower);
 
-    string::size_type beg = 0;
-    string::size_type end;
-    
     __setNoDelete(true);
     try
     {
-	while (true)
+	string::size_type beg;
+	string::size_type end = 0;
+
+	while (end < s.length())
 	{
+	    static const string delim = " \t\n\r";
+	    
+	    beg = s.find_first_not_of(delim, end);
+	    if (beg == string::npos)
+	    {
+		break;
+	    }
+
 	    end = s.find(':', beg);
 	    if (end == string::npos)
 	    {
@@ -397,7 +405,7 @@ Ice::ObjectAdapterI::ObjectAdapterI(const InstancePtr& instance, const string& n
 	    
 	    if (end == beg)
 	    {
-		throw EndpointParseException(__FILE__, __LINE__);
+		break;
 	    }
 	    
 	    string es = s.substr(beg, end - beg);
@@ -409,13 +417,8 @@ Ice::ObjectAdapterI::ObjectAdapterI(const InstancePtr& instance, const string& n
 	    //
 	    EndpointPtr endp = Endpoint::endpointFromString(instance, es);
 	    _incomingConnectionFactories.push_back(new IncomingConnectionFactory(instance, endp, this));
-	    
-	    if (end == s.length())
-	    {
-		break;
-	    }
-	    
-	    beg = end + 1;
+
+	    end = end + 1;
 	}
     }
     catch(...)
diff --git a/cpp/src/Ice/ObjectFactoryManagerF.h b/cpp/src/Ice/ObjectFactoryManagerF.h
index a5dff7cd66a..c9d1bd79004 100644
--- a/cpp/src/Ice/ObjectFactoryManagerF.h
+++ b/cpp/src/Ice/ObjectFactoryManagerF.h
@@ -19,7 +19,7 @@ namespace IceInternal
 class ObjectFactoryManager;
 void incRef(ObjectFactoryManager*);
 void decRef(ObjectFactoryManager*);
-typedef IceInternal::Handle<ObjectFactoryManager> ObjectFactoryManagerPtr;
+typedef Handle<ObjectFactoryManager> ObjectFactoryManagerPtr;
 
 }
 
diff --git a/cpp/src/Ice/PropertiesI.cpp b/cpp/src/Ice/PropertiesI.cpp
index e119d8bc0ba..156278b92ab 100644
--- a/cpp/src/Ice/PropertiesI.cpp
+++ b/cpp/src/Ice/PropertiesI.cpp
@@ -220,15 +220,13 @@ Ice::PropertiesI::parseLine(const string& line)
 	return;
     }
     
+    string value;
     beg = s.find_first_not_of(delim + "=", end);
-    if (beg == string::npos)
+    if (beg != string::npos)
     {
-	return;
+	end = s.length();
+	value = s.substr(beg, end - beg);
     }
     
-    end = s.length();
-    
-    string value = s.substr(beg, end - beg);
-    
     setProperty(key, value);
 }
diff --git a/cpp/src/Ice/Proxy.cpp b/cpp/src/Ice/Proxy.cpp
index ab06b5c541b..d00e0c98a73 100644
--- a/cpp/src/Ice/Proxy.cpp
+++ b/cpp/src/Ice/Proxy.cpp
@@ -695,7 +695,7 @@ IceDelegateM::Ice::Object::setup(const ReferencePtr& ref)
 	list<ConnectionPtr>::iterator p;
 	for (p = connections.begin(); p != connections.end(); ++p)
 	{
-	    if ((*p)->endpoint() == endpoints.front());
+	    if ((*p)->endpoint() == endpoints.front())
 	    {
 		break;
 	    }
diff --git a/cpp/src/Ice/ReferenceFactoryF.h b/cpp/src/Ice/ReferenceFactoryF.h
index 5bcb07fee46..ffeaebc5a68 100644
--- a/cpp/src/Ice/ReferenceFactoryF.h
+++ b/cpp/src/Ice/ReferenceFactoryF.h
@@ -17,9 +17,9 @@ namespace IceInternal
 {
 
 class ReferenceFactory;
-ICE_API void incRef(ReferenceFactory*);
-ICE_API void decRef(ReferenceFactory*);
-typedef IceInternal::Handle<ReferenceFactory> ReferenceFactoryPtr;
+void incRef(ReferenceFactory*);
+void decRef(ReferenceFactory*);
+typedef Handle<ReferenceFactory> ReferenceFactoryPtr;
 
 }
 
diff --git a/cpp/src/Ice/RouterInfoF.h b/cpp/src/Ice/RouterInfoF.h
index 5171a0f5bc2..72afbc70e7f 100644
--- a/cpp/src/Ice/RouterInfoF.h
+++ b/cpp/src/Ice/RouterInfoF.h
@@ -19,12 +19,12 @@ namespace IceInternal
 class RouterManager;
 void incRef(RouterManager*);
 void decRef(RouterManager*);
-typedef IceInternal::Handle<RouterManager> RouterManagerPtr;
+typedef Handle<RouterManager> RouterManagerPtr;
 
 class RouterInfo;
 void incRef(RouterInfo*);
 void decRef(RouterInfo*);
-typedef IceInternal::Handle<RouterInfo> RouterInfoPtr;
+typedef Handle<RouterInfo> RouterInfoPtr;
 
 }
 
diff --git a/cpp/src/Ice/SUdpClientControlChannel.h b/cpp/src/Ice/SUdpClientControlChannel.h
index fcace0b1897..84b512e304c 100644
--- a/cpp/src/Ice/SUdpClientControlChannel.h
+++ b/cpp/src/Ice/SUdpClientControlChannel.h
@@ -14,13 +14,6 @@
 #include <Ice/SUdpControlChannel.h>
 #include <Ice/SecureUdp.h>
 
-namespace IceInternal
-{
-
-class SUdpTransceiverPtr;
-
-}
-
 namespace IceSecurity
 {
 
diff --git a/cpp/src/Ice/SUdpControlChannel.cpp b/cpp/src/Ice/SUdpControlChannel.cpp
index 127e04908a5..ecf711ed119 100644
--- a/cpp/src/Ice/SUdpControlChannel.cpp
+++ b/cpp/src/Ice/SUdpControlChannel.cpp
@@ -14,13 +14,13 @@
 using namespace std;
 using namespace Ice;
 
-void IceSecurity::SecureUdp::incRef(ControlChannel* p) { p->__incRef(); }
-void IceSecurity::SecureUdp::decRef(ControlChannel* p) { p->__decRef(); }
+void IceInternal::incRef(::IceSecurity::SecureUdp::ControlChannel* p) { p->__incRef(); }
+void IceInternal::decRef(::IceSecurity::SecureUdp::ControlChannel* p) { p->__decRef(); }
 
 IceSecurity::SecureUdp::ControlChannel::ControlChannel(const SUdpTransceiverPtr& transceiver,
                                                        const InstancePtr& instance) :
-                                       _transceiver(transceiver),
-                                       _instance(instance)
+    _transceiver(transceiver),
+    _instance(instance)
 {
     assert(transceiver);
 }
diff --git a/cpp/src/Ice/SUdpControlChannel.h b/cpp/src/Ice/SUdpControlChannel.h
index 38a42c3b3b1..7986b86780c 100644
--- a/cpp/src/Ice/SUdpControlChannel.h
+++ b/cpp/src/Ice/SUdpControlChannel.h
@@ -32,6 +32,7 @@ class ControlChannel : public virtual Shared
 {
 
 protected:
+
     ControlChannel(const SUdpTransceiverPtr&, const InstancePtr&);
     virtual ~ControlChannel();
 
diff --git a/cpp/src/Ice/SUdpControlChannelF.h b/cpp/src/Ice/SUdpControlChannelF.h
index 30ac312ea3d..4ee25ced4ad 100644
--- a/cpp/src/Ice/SUdpControlChannelF.h
+++ b/cpp/src/Ice/SUdpControlChannelF.h
@@ -20,8 +20,25 @@ namespace SecureUdp
 {
 
 class ControlChannel;
-void incRef(ControlChannel*);
-void decRef(ControlChannel*);
+
+}
+
+}
+
+namespace IceInternal
+{
+
+void incRef(::IceSecurity::SecureUdp::ControlChannel*);
+void decRef(::IceSecurity::SecureUdp::ControlChannel*);
+
+}
+
+namespace IceSecurity
+{
+
+namespace SecureUdp
+{
+
 typedef IceInternal::Handle<ControlChannel> ControlChannelPtr;
 
 }
diff --git a/cpp/src/Ice/SUdpServerControlChannel.h b/cpp/src/Ice/SUdpServerControlChannel.h
index 34991566849..7a403caf918 100644
--- a/cpp/src/Ice/SUdpServerControlChannel.h
+++ b/cpp/src/Ice/SUdpServerControlChannel.h
@@ -14,13 +14,6 @@
 #include <Ice/SUdpControlChannel.h>
 #include <Ice/SecureUdp.h>
 
-namespace IceInternal
-{
-
-class SUdpTransceiverPtr;
-
-}
-
 namespace IceSecurity
 {
 
diff --git a/cpp/src/Ice/SUdpTransceiverF.h b/cpp/src/Ice/SUdpTransceiverF.h
index f46bd48b8a8..a415e3e2686 100644
--- a/cpp/src/Ice/SUdpTransceiverF.h
+++ b/cpp/src/Ice/SUdpTransceiverF.h
@@ -19,7 +19,7 @@ namespace IceInternal
 class SUdpTransceiver;
 void incRef(SUdpTransceiver*);
 void decRef(SUdpTransceiver*);
-typedef IceInternal::Handle<SUdpTransceiver> SUdpTransceiverPtr;
+typedef Handle<SUdpTransceiver> SUdpTransceiverPtr;
 
 }
 
diff --git a/cpp/src/Ice/SslAcceptor.cpp b/cpp/src/Ice/SslAcceptor.cpp
index bf2281eceaf..78bc9ddf736 100644
--- a/cpp/src/Ice/SslAcceptor.cpp
+++ b/cpp/src/Ice/SslAcceptor.cpp
@@ -9,7 +9,7 @@
 // **********************************************************************
 
 #ifdef WIN32
-#pragma warning(disable:4786)
+#   pragma warning(disable:4786) // TODO: Comment about what the disabled warning is.
 #endif
 
 #include <Ice/SslFactory.h>
diff --git a/cpp/src/Ice/SslConnection.h b/cpp/src/Ice/SslConnection.h
index 3d9d5216400..70ad876955a 100644
--- a/cpp/src/Ice/SslConnection.h
+++ b/cpp/src/Ice/SslConnection.h
@@ -27,10 +27,9 @@ using Ice::LoggerPtr;
 
 class Connection
 {
-
 public:
 
-    virtual ~Connection() {};
+    virtual ~Connection() { };
 
     virtual void shutdown() = 0;
 
diff --git a/cpp/src/Ice/SslConnectionOpenSSL.h b/cpp/src/Ice/SslConnectionOpenSSL.h
index 8404cc78330..141ce8531c4 100644
--- a/cpp/src/Ice/SslConnectionOpenSSL.h
+++ b/cpp/src/Ice/SslConnectionOpenSSL.h
@@ -79,14 +79,14 @@ private:
 
 class HandshakeSentinel
 {
-
 public:
+
     HandshakeSentinel(SafeFlag& handshakeFlag) :
-                     _flag(handshakeFlag)
+	_flag(handshakeFlag)
     {
         _ownHandshake = _flag.checkAndSet();
     }
-
+    
     ~HandshakeSentinel()
     { 
         if (_ownHandshake)
@@ -101,13 +101,13 @@ public:
     }
 
 private:
+
     bool _ownHandshake;
     SafeFlag& _flag;
 };
 
 class Connection : public IceSecurity::Ssl::Connection
 {
-
 public:
 
     Connection(SSL*, string&);
diff --git a/cpp/src/Ice/SslSystem.h b/cpp/src/Ice/SslSystem.h
index ed73f5de9f6..d464aea4db2 100644
--- a/cpp/src/Ice/SslSystem.h
+++ b/cpp/src/Ice/SslSystem.h
@@ -8,7 +8,6 @@
 //
 // **********************************************************************
 
-
 #ifndef ICE_SSL_SYSTEM_H
 #define ICE_SSL_SYSTEM_H
 
@@ -28,13 +27,14 @@ using Ice::PropertiesPtr;
 
 class Factory;
 
-// TODO: Can we derive this from Shared?  How hard would that be?
+// TODO: Can we derive this from Shared? How hard would that be?
+// TODO: <ml>Absolutely. Please do not add yet another reference counting mechanism.</ml>
 
 class System
 {
-
 public:
-    inline string getSystemID() const { return _systemID; };
+
+    string getSystemID() const { return _systemID; };
 
     virtual bool isConfigLoaded() = 0;
     virtual void loadConfig() = 0;
@@ -58,8 +58,9 @@ protected:
     virtual ~System();
 
     // Reference counting.
-    inline void incRef() { _refCount++; };
-    inline bool decRef() { return (--_refCount ? true : false); };
+    // TODO: Remove this, use IceUtil::Shared or Ice::Shared.
+    void incRef() { _refCount++; };
+    bool decRef() { return (--_refCount ? true : false); };
 
     string _systemID;
     int _refCount;
@@ -67,9 +68,8 @@ protected:
     TraceLevelsPtr _traceLevels;
     LoggerPtr _logger;
     PropertiesPtr _properties;
-
-friend class Factory;
-
+    
+    friend class Factory;
 };
 
 }
diff --git a/cpp/src/Ice/SslSystemOpenSSL.cpp b/cpp/src/Ice/SslSystemOpenSSL.cpp
index 35f6aa366ef..94c8875c68e 100644
--- a/cpp/src/Ice/SslSystemOpenSSL.cpp
+++ b/cpp/src/Ice/SslSystemOpenSSL.cpp
@@ -7,8 +7,9 @@
 // All Rights Reserved
 //
 // **********************************************************************
+
 #ifdef WIN32
-#pragma warning(disable:4786)
+#   pragma warning(disable:4786) // TODO: Comment about what this warning disables.
 #endif
 
 //
@@ -301,7 +302,8 @@ verifyCallback(int ok, X509_STORE_CTX *ctx)
 
         if (!ok)
         {
-            outStringStream << "verify error: num = " << verifyError << " : "  << X509_verify_cert_error_string(verifyError) << endl;
+            outStringStream << "verify error: num = " << verifyError << " : " 
+			    << X509_verify_cert_error_string(verifyError) << endl;
 
         }
 
@@ -331,7 +333,8 @@ verifyCallback(int ok, X509_STORE_CTX *ctx)
 
         outStringStream << "verify return = " << ok << endl;
 
-        IceSecurity::Ssl::OpenSSL::System::_globalLogger->trace(IceSecurity::Ssl::OpenSSL::System::_globalTraceLevels->securityCat, outStringStream.str());
+        IceSecurity::Ssl::OpenSSL::System::_globalLogger->trace(
+	    IceSecurity::Ssl::OpenSSL::System::_globalTraceLevels->securityCat, outStringStream.str());
     }
 
     return ok;
@@ -452,7 +455,8 @@ bio_dump_cb(BIO *bio, int cmd, const char *argp, int argi, long argl, long ret)
 
         if (cmd == (BIO_CB_READ|BIO_CB_RETURN) || cmd == (BIO_CB_WRITE|BIO_CB_RETURN))
         {
-            IceSecurity::Ssl::OpenSSL::System::_globalLogger->trace(IceSecurity::Ssl::OpenSSL::System::_globalTraceLevels->securityCat, outStringStream.str());
+            IceSecurity::Ssl::OpenSSL::System::_globalLogger->trace(
+		IceSecurity::Ssl::OpenSSL::System::_globalTraceLevels->securityCat, outStringStream.str());
         }
     }
 
diff --git a/cpp/src/Ice/SslSystemOpenSSL.h b/cpp/src/Ice/SslSystemOpenSSL.h
index 11ae099a8cb..96bef9b80cb 100644
--- a/cpp/src/Ice/SslSystemOpenSSL.h
+++ b/cpp/src/Ice/SslSystemOpenSSL.h
@@ -26,13 +26,13 @@ namespace IceSecurity
 namespace Ssl
 {
 
-typedef enum
+enum SslProtocol
 {
     SSL_V2 = 1,     // Only speak SSLv2
     SSL_V23,        // Speak SSLv2 and SSLv3
     SSL_V3,         // Only speak SSLv3
     TLS_V1          // Only speak TLSv1
-} SslProtocol;
+};
 
 }
 
@@ -76,7 +76,6 @@ typedef map<int,DiffieHellmanParamsFile> DHParamsMap;
 
 class System : public IceSecurity::Ssl::System
 {
-
 public:
 
     void printContextInfo(SSL_CTX*);
@@ -109,15 +108,15 @@ public:
 
 protected:
 
-     System(string&);
+    System(string&);
     ~System();
-
+    
 private:
-
+    
     // Base Diffie-Hellman 512bit key (only to be used for key exchange).
     static unsigned char _tempDiffieHellman512p[];
     static unsigned char _tempDiffieHellman512g[];
-
+    
     // Default SSL Contexts, for both Server and Client connections.
     SSL_CTX* _sslServerContext;
     SSL_CTX* _sslClientContext;
@@ -159,8 +158,8 @@ private:
     // Retrieves errors from the OpenSSL library.
     string sslGetErrors();
 
-    void commonConnectionSetup(Connection*);
-
+    void commonConnectionSetup(Connection*);
+
     // Create a connection.
     SSL* createConnection(SSL_CTX*, int);
 
@@ -185,7 +184,6 @@ private:
 
     friend class IceSecurity::Ssl::Factory;
     friend class Connection;
-
 };
 
 }
diff --git a/cpp/src/Ice/ThreadPoolF.h b/cpp/src/Ice/ThreadPoolF.h
index f8b8018fdc5..44332d6c413 100644
--- a/cpp/src/Ice/ThreadPoolF.h
+++ b/cpp/src/Ice/ThreadPoolF.h
@@ -19,7 +19,7 @@ namespace IceInternal
 class ThreadPool;
 void incRef(ThreadPool*);
 void decRef(ThreadPool*);
-typedef IceInternal::Handle<ThreadPool> ThreadPoolPtr;
+typedef Handle<ThreadPool> ThreadPoolPtr;
 
 }
 
diff --git a/cpp/src/Ice/TraceLevelsF.h b/cpp/src/Ice/TraceLevelsF.h
index 16b0f577126..8b6e37218b6 100644
--- a/cpp/src/Ice/TraceLevelsF.h
+++ b/cpp/src/Ice/TraceLevelsF.h
@@ -19,7 +19,7 @@ namespace IceInternal
 class TraceLevels;
 void incRef(TraceLevels*);
 void decRef(TraceLevels*);
-typedef IceInternal::Handle<TraceLevels> TraceLevelsPtr;
+typedef Handle<TraceLevels> TraceLevelsPtr;
 
 }
 
diff --git a/cpp/src/Ice/TransceiverF.h b/cpp/src/Ice/TransceiverF.h
index 9f9c0639b82..408c922b472 100644
--- a/cpp/src/Ice/TransceiverF.h
+++ b/cpp/src/Ice/TransceiverF.h
@@ -19,7 +19,7 @@ namespace IceInternal
 class Transceiver;
 void incRef(Transceiver*);
 void decRef(Transceiver*);
-typedef IceInternal::Handle<Transceiver> TransceiverPtr;
+typedef Handle<Transceiver> TransceiverPtr;
 
 }
 
diff --git a/cpp/src/Ice/UdpTransceiver.h b/cpp/src/Ice/UdpTransceiver.h
index 4425ca95b29..e70f99a5d97 100644
--- a/cpp/src/Ice/UdpTransceiver.h
+++ b/cpp/src/Ice/UdpTransceiver.h
@@ -51,6 +51,7 @@ private:
     virtual ~UdpTransceiver();
 
     friend class UdpEndpoint;
+    friend class SUdpEndpoint; // TODO: Remove as soon as SUdpEndpoint uses SUdpTransceiver.
     friend class SUdpTransceiver;
 
     InstancePtr _instance;
diff --git a/cpp/src/Ice/ice.dsp b/cpp/src/Ice/ice.dsp
index e87143fcd95..474be39f26b 100644
--- a/cpp/src/Ice/ice.dsp
+++ b/cpp/src/Ice/ice.dsp
@@ -25,7 +25,7 @@ CFG=Ice - Win32 Debug
 # PROP AllowPerConfigDependencies 0
 # PROP Scc_ProjName ""
 # PROP Scc_LocalPath ""
-CPP=cl.exe
+CPP=xicl6.exe
 MTL=midl.exe
 RSC=rc.exe
 
@@ -52,9 +52,9 @@ RSC=rc.exe
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
-LINK32=link.exe
+LINK32=xilink6.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 ws2_32.lib libeay32.lib ssleay32.lib xerces-c_1.lib /nologo /dll /machine:I386 /out:"Release/ice001.dll"
+# ADD LINK32 ws2_32.lib libeay32.lib ssleay32.lib xerces-c_1.lib /nologo /dll /machine:I386 /nodefaultlib /out:"Release/ice001.dll"
 # SUBTRACT LINK32 /pdb:none /debug
 # Begin Special Build Tool
 SOURCE="$(InputPath)"
@@ -75,7 +75,7 @@ PostBuild_Cmds=copy Release\ice001.* ..\..\lib
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBRARY_EXPORTS" /Yu"stdafx.h" /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /WX /Gm /GR /GX /Zi /Od /I ".." /I "../../include" /D "WIN32" /D "_UNICODE" /D "_DEBUG" /D "_CONSOLE" /D "_USRDLL" /D "ICE_API_EXPORTS" /D "ICE_SECURITY_DEBUG" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /WX /Gm /GR /GX /Zi /Od /I ".." /I "../../include" /D "WIN32" /D "_UNICODE" /D "_DEBUG" /D "_CONSOLE" /D "_USRDLL" /D "ICE_API_EXPORTS" /YX /FD /GZ /c
 # SUBTRACT CPP /Fr
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
@@ -84,10 +84,10 @@ PostBuild_Cmds=copy Release\ice001.* ..\..\lib
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
-LINK32=link.exe
+LINK32=xilink6.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
 # ADD LINK32 ws2_32.lib libeay32.lib ssleay32.lib xerces-c_1D.lib /nologo /dll /debug /machine:I386 /out:"Debug/ice001d.dll" /pdbtype:sept
-# SUBTRACT LINK32 /pdb:none
+# SUBTRACT LINK32 /pdb:none /nodefaultlib
 # Begin Special Build Tool
 SOURCE="$(InputPath)"
 PostBuild_Cmds=copy Debug\ice001d.* ..\..\lib
@@ -124,18 +124,6 @@ SOURCE=.\CommunicatorI.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\Router.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\RouterInfo.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\RoutingTable.cpp
-# End Source File
-# Begin Source File
-
 SOURCE=.\Connection.cpp
 # End Source File
 # Begin Source File
@@ -260,6 +248,22 @@ SOURCE=.\ReferenceFactory.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\Router.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\RouterInfo.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\RoutingTable.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\SecureUdp.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\SecurityException.cpp
 # End Source File
 # Begin Source File
@@ -344,6 +348,22 @@ SOURCE=.\StreamI.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\SUdpClientControlChannel.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\SUdpControlChannel.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\SUdpServerControlChannel.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\SUdpTransceiver.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\TcpAcceptor.cpp
 # End Source File
 # Begin Source File
@@ -420,30 +440,6 @@ SOURCE=.\CommunicatorI.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\Ice\Router.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\Ice\RouterF.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\Ice\RouterInfo.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\RouterInfoF.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\Ice\RoutingTable.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\Ice\RoutingTableF.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\include\Ice\Config.h
 # End Source File
 # Begin Source File
@@ -616,6 +612,10 @@ SOURCE=..\..\include\Ice\Outgoing.h
 # End Source File
 # Begin Source File
 
+SOURCE=.\PicklerI.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\Ice\Properties.h
 # End Source File
 # Begin Source File
@@ -668,6 +668,38 @@ SOURCE=.\ReferenceFactoryF.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\include\Ice\Router.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\Ice\RouterF.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\Ice\RouterInfo.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\RouterInfo.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\RouterInfoF.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\Ice\RoutingTable.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\Ice\RoutingTableF.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\SecureUdp.h
+# End Source File
+# Begin Source File
+
 SOURCE=.\Security.h
 # End Source File
 # Begin Source File
@@ -760,6 +792,30 @@ SOURCE=.\StreamI.h
 # End Source File
 # Begin Source File
 
+SOURCE=.\SUdpClientControlChannel.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\SUdpControlChannel.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\SUdpControlChannelF.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\SUdpServerControlChannel.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\SUdpTransceiver.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\SUdpTransceiverF.h
+# End Source File
+# Begin Source File
+
 SOURCE=.\TcpAcceptor.h
 # End Source File
 # Begin Source File
@@ -904,86 +960,6 @@ InputPath=..\..\slice\Ice\CommunicatorF.ice
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\slice\Ice\Router.ice
-
-!IF  "$(CFG)" == "Ice - Win32 Release"
-
-USERDEP__COMMU="../../bin/slice2cpp.exe"	
-# Begin Custom Build
-InputPath=..\..\slice\Ice\Router.ice
-
-BuildCmds= \
-	set PATH=%PATH%;..\..\lib \
-	..\..\bin\slice2cpp.exe --dll-export ICE_API --include-dir Ice -I../../slice ../../slice/Ice/Router.ice \
-	move Router.h ..\..\include\Ice \
-	
-
-"..\..\include\Ice\Router.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-   $(BuildCmds)
-
-"Router.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-   $(BuildCmds)
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "Ice - Win32 Debug"
-
-USERDEP__COMMU="../../bin/slice2cpp.exe"	
-# Begin Custom Build
-InputPath=..\..\slice\Ice\Router.ice
-
-BuildCmds= \
-	set PATH=%PATH%;..\..\lib \
-	..\..\bin\slice2cpp.exe --dll-export ICE_API --include-dir Ice -I../../slice ../../slice/Ice/Router.ice \
-	move Router.h ..\..\include\Ice \
-	
-
-"..\..\include\Ice\Router.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-   $(BuildCmds)
-
-"Router.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-   $(BuildCmds)
-# End Custom Build
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\slice\Ice\RouterF.ice
-
-!IF  "$(CFG)" == "Ice - Win32 Release"
-
-USERDEP__COMMUN="../../bin/slice2cpp.exe"	
-# Begin Custom Build
-InputPath=..\..\slice\Ice\RouterF.ice
-
-"..\..\include\Ice\RouterF.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	set PATH=%PATH%;..\..\lib 
-	..\..\bin\slice2cpp.exe --dll-export ICE_API --include-dir Ice -I../../slice ../../slice/Ice/RouterF.ice 
-	move RouterF.h ..\..\include\Ice 
-	del RouterF.cpp 
-	
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "Ice - Win32 Debug"
-
-USERDEP__COMMUN="../../bin/slice2cpp.exe"	
-# Begin Custom Build
-InputPath=..\..\slice\Ice\RouterF.ice
-
-"..\..\include\Ice\RouterF.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	set PATH=%PATH%;..\..\lib 
-	..\..\bin\slice2cpp.exe --dll-export ICE_API --include-dir Ice -I../../slice ../../slice/Ice/RouterF.ice 
-	move RouterF.h ..\..\include\Ice 
-	del RouterF.cpp 
-	
-# End Custom Build
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\slice\Ice\Current.ice
 
 !IF  "$(CFG)" == "Ice - Win32 Release"
@@ -1439,6 +1415,129 @@ InputPath=..\..\slice\Ice\PropertiesF.ice
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\slice\Ice\Router.ice
+
+!IF  "$(CFG)" == "Ice - Win32 Release"
+
+USERDEP__ROUTE="../../bin/slice2cpp.exe"	
+# Begin Custom Build
+InputPath=..\..\slice\Ice\Router.ice
+
+BuildCmds= \
+	set PATH=%PATH%;..\..\lib \
+	..\..\bin\slice2cpp.exe --dll-export ICE_API --include-dir Ice -I../../slice ../../slice/Ice/Router.ice \
+	move Router.h ..\..\include\Ice \
+	
+
+"..\..\include\Ice\Router.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"Router.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "Ice - Win32 Debug"
+
+USERDEP__ROUTE="../../bin/slice2cpp.exe"	
+# Begin Custom Build
+InputPath=..\..\slice\Ice\Router.ice
+
+BuildCmds= \
+	set PATH=%PATH%;..\..\lib \
+	..\..\bin\slice2cpp.exe --dll-export ICE_API --include-dir Ice -I../../slice ../../slice/Ice/Router.ice \
+	move Router.h ..\..\include\Ice \
+	
+
+"..\..\include\Ice\Router.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"Router.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+# End Custom Build
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\slice\Ice\RouterF.ice
+
+!IF  "$(CFG)" == "Ice - Win32 Release"
+
+USERDEP__ROUTER="../../bin/slice2cpp.exe"	
+# Begin Custom Build
+InputPath=..\..\slice\Ice\RouterF.ice
+
+"..\..\include\Ice\RouterF.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	set PATH=%PATH%;..\..\lib 
+	..\..\bin\slice2cpp.exe --dll-export ICE_API --include-dir Ice -I../../slice ../../slice/Ice/RouterF.ice 
+	move RouterF.h ..\..\include\Ice 
+	del RouterF.cpp 
+	
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "Ice - Win32 Debug"
+
+USERDEP__ROUTER="../../bin/slice2cpp.exe"	
+# Begin Custom Build
+InputPath=..\..\slice\Ice\RouterF.ice
+
+"..\..\include\Ice\RouterF.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	set PATH=%PATH%;..\..\lib 
+	..\..\bin\slice2cpp.exe --dll-export ICE_API --include-dir Ice -I../../slice ../../slice/Ice/RouterF.ice 
+	move RouterF.h ..\..\include\Ice 
+	del RouterF.cpp 
+	
+# End Custom Build
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\slice\Ice\SecureUdp.ice
+
+!IF  "$(CFG)" == "Ice - Win32 Release"
+
+USERDEP__SECUR="../../bin/slice2cpp.exe"	
+# Begin Custom Build
+InputPath=..\..\slice\Ice\SecureUdp.ice
+
+BuildCmds= \
+	set PATH=%PATH%;..\..\lib \
+	..\..\bin\slice2cpp.exe --include-dir Ice -I../../slice ../../slice/Ice/SecureUdp.ice \
+	
+
+"SecureUdp.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"SecureUdp.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "Ice - Win32 Debug"
+
+USERDEP__SECUR="../../bin/slice2cpp.exe"	
+# Begin Custom Build
+InputPath=..\..\slice\Ice\SecureUdp.ice
+
+BuildCmds= \
+	set PATH=%PATH%;..\..\lib \
+	..\..\bin\slice2cpp.exe --include-dir Ice -I../../slice ../../slice/Ice/SecureUdp.ice \
+	
+
+"SecureUdp.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"SecureUdp.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+# End Custom Build
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\slice\Ice\SecurityException.ice
 
 !IF  "$(CFG)" == "Ice - Win32 Release"
@@ -1461,7 +1560,7 @@ BuildCmds= \
 
 !ELSEIF  "$(CFG)" == "Ice - Win32 Debug"
 
-USERDEP__SECUR="../../bin/slice2cpp.exe"	
+USERDEP__SECURI="../../bin/slice2cpp.exe"	
 # Begin Custom Build
 InputPath=..\..\slice\Ice\SecurityException.ice
 
diff --git a/cpp/src/IcePack/icepack.dsp b/cpp/src/IcePack/icepack.dsp
index e28cef43b26..09469b146d6 100644
--- a/cpp/src/IcePack/icepack.dsp
+++ b/cpp/src/IcePack/icepack.dsp
@@ -25,7 +25,7 @@ CFG=IcePack - Win32 Debug
 # PROP AllowPerConfigDependencies 0
 # PROP Scc_ProjName ""
 # PROP Scc_LocalPath ""
-CPP=cl.exe
+CPP=xicl6.exe
 MTL=midl.exe
 RSC=rc.exe
 
@@ -52,9 +52,9 @@ RSC=rc.exe
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
-LINK32=link.exe
+LINK32=xilink6.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 /nologo /dll /machine:I386 /out:"Release/icepack001.dll" /libpath:"../../../lib"
+# ADD LINK32 /nologo /dll /machine:I386 /nodefaultlib /out:"Release/icepack001.dll" /libpath:"../../../lib"
 # SUBTRACT LINK32 /pdb:none /debug
 # Begin Special Build Tool
 SOURCE="$(InputPath)"
@@ -84,10 +84,10 @@ PostBuild_Cmds=copy Release\icepack001.* ..\..\lib
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
-LINK32=link.exe
+LINK32=xilink6.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
 # ADD LINK32 /nologo /dll /debug /machine:I386 /out:"Debug/icepack001d.dll" /pdbtype:sept /libpath:"../../../lib"
-# SUBTRACT LINK32 /pdb:none
+# SUBTRACT LINK32 /pdb:none /nodefaultlib
 # Begin Special Build Tool
 SOURCE="$(InputPath)"
 PostBuild_Cmds=copy Debug\icepack001d.* ..\..\lib
diff --git a/cpp/src/IcePack/icepackC.dsp b/cpp/src/IcePack/icepackC.dsp
index 6a4874383eb..4628d4f8044 100644
--- a/cpp/src/IcePack/icepackC.dsp
+++ b/cpp/src/IcePack/icepackC.dsp
@@ -25,7 +25,7 @@ CFG=IcePackC - Win32 Debug
 # PROP AllowPerConfigDependencies 0
 # PROP Scc_ProjName ""
 # PROP Scc_LocalPath ""
-CPP=cl.exe
+CPP=xicl6.exe
 RSC=rc.exe
 
 !IF  "$(CFG)" == "IcePackC - Win32 Release"
@@ -49,9 +49,9 @@ RSC=rc.exe
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
-LINK32=link.exe
+LINK32=xilink6.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 setargv.obj /nologo /subsystem:console /machine:I386 /out:"../../bin/icepackadmin.exe" /libpath:"../../../lib"
+# ADD LINK32 setargv.obj /nologo /subsystem:console /machine:I386 /nodefaultlib /out:"../../bin/icepackadmin.exe" /libpath:"../../../lib"
 # SUBTRACT LINK32 /debug
 
 !ELSEIF  "$(CFG)" == "IcePackC - Win32 Debug"
@@ -75,9 +75,10 @@ LINK32=link.exe
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
-LINK32=link.exe
+LINK32=xilink6.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
 # ADD LINK32 setargv.obj /nologo /subsystem:console /debug /machine:I386 /out:"../../bin/icepackadmin.exe" /pdbtype:sept /libpath:"../../../lib"
+# SUBTRACT LINK32 /nodefaultlib
 
 !ENDIF 
 
diff --git a/cpp/src/IcePack/icepackS.dsp b/cpp/src/IcePack/icepackS.dsp
index 98113dbb2fb..88f3a91be05 100644
--- a/cpp/src/IcePack/icepackS.dsp
+++ b/cpp/src/IcePack/icepackS.dsp
@@ -25,7 +25,7 @@ CFG=IcePackS - Win32 Debug
 # PROP AllowPerConfigDependencies 0
 # PROP Scc_ProjName ""
 # PROP Scc_LocalPath ""
-CPP=cl.exe
+CPP=xicl6.exe
 RSC=rc.exe
 
 !IF  "$(CFG)" == "IcePackS - Win32 Release"
@@ -49,9 +49,9 @@ RSC=rc.exe
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
-LINK32=link.exe
+LINK32=xilink6.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 /nologo /subsystem:console /machine:I386 /out:"../../bin/icepack.exe" /libpath:"../../../lib"
+# ADD LINK32 /nologo /subsystem:console /machine:I386 /nodefaultlib /out:"../../bin/icepack.exe" /libpath:"../../../lib"
 # SUBTRACT LINK32 /debug
 
 !ELSEIF  "$(CFG)" == "IcePackS - Win32 Debug"
@@ -75,9 +75,10 @@ LINK32=link.exe
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
-LINK32=link.exe
+LINK32=xilink6.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
 # ADD LINK32 /nologo /subsystem:console /debug /machine:I386 /out:"../../bin/icepack.exe" /pdbtype:sept /libpath:"../../../lib"
+# SUBTRACT LINK32 /nodefaultlib
 
 !ENDIF 
 
diff --git a/cpp/src/IceStorm/icestorm.dsp b/cpp/src/IceStorm/icestorm.dsp
index 57f487ff81f..31eddcc73bd 100644
--- a/cpp/src/IceStorm/icestorm.dsp
+++ b/cpp/src/IceStorm/icestorm.dsp
@@ -25,7 +25,7 @@ CFG=IceStorm - Win32 Debug
 # PROP AllowPerConfigDependencies 0
 # PROP Scc_ProjName ""
 # PROP Scc_LocalPath ""
-CPP=cl.exe
+CPP=xicl6.exe
 MTL=midl.exe
 RSC=rc.exe
 
@@ -52,9 +52,9 @@ RSC=rc.exe
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
-LINK32=link.exe
+LINK32=xilink6.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 /nologo /dll /machine:I386 /out:"Release/icestorm001.dll" /libpath:"../../../lib"
+# ADD LINK32 /nologo /dll /machine:I386 /nodefaultlib /out:"Release/icestorm001.dll" /libpath:"../../../lib"
 # SUBTRACT LINK32 /pdb:none /debug
 # Begin Special Build Tool
 SOURCE="$(InputPath)"
@@ -84,10 +84,10 @@ PostBuild_Cmds=copy Release\icestorm001.* ..\..\lib
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
-LINK32=link.exe
+LINK32=xilink6.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
 # ADD LINK32 /nologo /dll /debug /machine:I386 /out:"Debug/icestorm001d.dll" /pdbtype:sept /libpath:"../../../lib"
-# SUBTRACT LINK32 /pdb:none
+# SUBTRACT LINK32 /pdb:none /nodefaultlib
 # Begin Special Build Tool
 SOURCE="$(InputPath)"
 PostBuild_Cmds=copy Debug\icestorm001d.* ..\..\lib
diff --git a/cpp/src/IceStorm/icestormC.dsp b/cpp/src/IceStorm/icestormC.dsp
index 62370fa553e..9500c9cd842 100644
--- a/cpp/src/IceStorm/icestormC.dsp
+++ b/cpp/src/IceStorm/icestormC.dsp
@@ -25,7 +25,7 @@ CFG=IceStormC - Win32 Debug
 # PROP AllowPerConfigDependencies 0
 # PROP Scc_ProjName ""
 # PROP Scc_LocalPath ""
-CPP=cl.exe
+CPP=xicl6.exe
 RSC=rc.exe
 
 !IF  "$(CFG)" == "IceStormC - Win32 Release"
@@ -49,9 +49,9 @@ RSC=rc.exe
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
-LINK32=link.exe
+LINK32=xilink6.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 setargv.obj xerces-c_1.lib /nologo /subsystem:console /machine:I386 /out:"../../bin/icestormadmin.exe" /libpath:"../../../lib"
+# ADD LINK32 setargv.obj xerces-c_1.lib /nologo /subsystem:console /machine:I386 /nodefaultlib /out:"../../bin/icestormadmin.exe" /libpath:"../../../lib"
 # SUBTRACT LINK32 /debug
 
 !ELSEIF  "$(CFG)" == "IceStormC - Win32 Debug"
@@ -75,9 +75,10 @@ LINK32=link.exe
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
-LINK32=link.exe
+LINK32=xilink6.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
 # ADD LINK32 setargv.obj xerces-c_1D.lib /nologo /subsystem:console /debug /machine:I386 /out:"../../bin/icestormadmin.exe" /pdbtype:sept /libpath:"../../../lib"
+# SUBTRACT LINK32 /nodefaultlib
 
 !ENDIF 
 
diff --git a/cpp/src/IceStorm/icestormS.dsp b/cpp/src/IceStorm/icestormS.dsp
index becaa51ef08..dd0e7972a4a 100644
--- a/cpp/src/IceStorm/icestormS.dsp
+++ b/cpp/src/IceStorm/icestormS.dsp
@@ -25,7 +25,7 @@ CFG=IceStormS - Win32 Debug
 # PROP AllowPerConfigDependencies 0
 # PROP Scc_ProjName ""
 # PROP Scc_LocalPath ""
-CPP=cl.exe
+CPP=xicl6.exe
 RSC=rc.exe
 
 !IF  "$(CFG)" == "IceStormS - Win32 Release"
@@ -49,9 +49,9 @@ RSC=rc.exe
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
-LINK32=link.exe
+LINK32=xilink6.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 /nologo /subsystem:console /machine:I386 /out:"../../bin/icestorm.exe" /libpath:"../../../lib"
+# ADD LINK32 /nologo /subsystem:console /machine:I386 /nodefaultlib /out:"../../bin/icestorm.exe" /libpath:"../../../lib"
 # SUBTRACT LINK32 /debug
 
 !ELSEIF  "$(CFG)" == "IceStormS - Win32 Debug"
@@ -75,9 +75,10 @@ LINK32=link.exe
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
-LINK32=link.exe
+LINK32=xilink6.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
 # ADD LINK32 /nologo /subsystem:console /debug /machine:I386 /out:"../../bin/icestorm.exe" /pdbtype:sept /libpath:"../../../lib"
+# SUBTRACT LINK32 /nodefaultlib
 
 !ENDIF 
 
diff --git a/cpp/src/IceUtil/iceutil.dsp b/cpp/src/IceUtil/iceutil.dsp
index 92f4e35faaf..052df0a92bf 100644
--- a/cpp/src/IceUtil/iceutil.dsp
+++ b/cpp/src/IceUtil/iceutil.dsp
@@ -25,7 +25,7 @@ CFG=IceUtil - Win32 Debug
 # PROP AllowPerConfigDependencies 0
 # PROP Scc_ProjName ""
 # PROP Scc_LocalPath ""
-CPP=cl.exe
+CPP=xicl6.exe
 MTL=midl.exe
 RSC=rc.exe
 
@@ -52,9 +52,9 @@ RSC=rc.exe
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
-LINK32=link.exe
+LINK32=xilink6.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 /nologo /dll /machine:I386 /out:"Release/iceutil001.dll"
+# ADD LINK32 /nologo /dll /machine:I386 /nodefaultlib /out:"Release/iceutil001.dll"
 # SUBTRACT LINK32 /pdb:none /debug
 # Begin Special Build Tool
 SOURCE="$(InputPath)"
@@ -84,10 +84,10 @@ PostBuild_Cmds=copy Release\iceutil001.* ..\..\lib
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
-LINK32=link.exe
+LINK32=xilink6.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
 # ADD LINK32 /nologo /dll /debug /machine:I386 /out:"Debug/iceutil001d.dll" /pdbtype:sept
-# SUBTRACT LINK32 /pdb:none
+# SUBTRACT LINK32 /pdb:none /nodefaultlib
 # Begin Special Build Tool
 SOURCE="$(InputPath)"
 PostBuild_Cmds=copy Debug\iceutil001d.* ..\..\lib
diff --git a/cpp/src/Slice/slice.dsp b/cpp/src/Slice/slice.dsp
index 58d5fd739ec..13dc045342c 100644
--- a/cpp/src/Slice/slice.dsp
+++ b/cpp/src/Slice/slice.dsp
@@ -25,7 +25,7 @@ CFG=Slice - Win32 Debug
 # PROP AllowPerConfigDependencies 0
 # PROP Scc_ProjName ""
 # PROP Scc_LocalPath ""
-CPP=cl.exe
+CPP=xicl6.exe
 MTL=midl.exe
 RSC=rc.exe
 
@@ -52,9 +52,9 @@ RSC=rc.exe
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
-LINK32=link.exe
+LINK32=xilink6.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 /nologo /dll /machine:I386 /out:"Release/slice001.dll"
+# ADD LINK32 /nologo /dll /machine:I386 /nodefaultlib /out:"Release/slice001.dll"
 # SUBTRACT LINK32 /pdb:none /debug
 # Begin Special Build Tool
 SOURCE="$(InputPath)"
@@ -84,10 +84,10 @@ PostBuild_Cmds=copy Release\slice001.* ..\..\lib
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
-LINK32=link.exe
+LINK32=xilink6.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
 # ADD LINK32 /nologo /dll /debug /machine:I386 /out:"Debug/slice001d.dll" /pdbtype:sept
-# SUBTRACT LINK32 /pdb:none
+# SUBTRACT LINK32 /pdb:none /nodefaultlib
 # Begin Special Build Tool
 SOURCE="$(InputPath)"
 PostBuild_Cmds=copy Debug\slice001d.* ..\..\lib
diff --git a/cpp/src/slice2cpp/slice2cpp.dsp b/cpp/src/slice2cpp/slice2cpp.dsp
index 49a8c64583e..2d125c89b9f 100644
--- a/cpp/src/slice2cpp/slice2cpp.dsp
+++ b/cpp/src/slice2cpp/slice2cpp.dsp
@@ -25,7 +25,7 @@ CFG=slice2cpp - Win32 Debug
 # PROP AllowPerConfigDependencies 0
 # PROP Scc_ProjName ""
 # PROP Scc_LocalPath ""
-CPP=cl.exe
+CPP=xicl6.exe
 RSC=rc.exe
 
 !IF  "$(CFG)" == "slice2cpp - Win32 Release"
@@ -49,9 +49,9 @@ RSC=rc.exe
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
-LINK32=link.exe
+LINK32=xilink6.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 setargv.obj /nologo /subsystem:console /machine:I386 /out:"../../bin/slice2cpp.exe" /libpath:"../../lib"
+# ADD LINK32 setargv.obj /nologo /subsystem:console /machine:I386 /nodefaultlib /out:"../../bin/slice2cpp.exe" /libpath:"../../lib"
 # SUBTRACT LINK32 /debug
 
 !ELSEIF  "$(CFG)" == "slice2cpp - Win32 Debug"
@@ -75,9 +75,10 @@ LINK32=link.exe
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
-LINK32=link.exe
+LINK32=xilink6.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
 # ADD LINK32 setargv.obj /nologo /subsystem:console /debug /machine:I386 /out:"../../bin/slice2cpp.exe" /pdbtype:sept /libpath:"../../lib"
+# SUBTRACT LINK32 /nodefaultlib
 
 !ENDIF 
 
diff --git a/cpp/src/slice2docbook/slice2docbook.dsp b/cpp/src/slice2docbook/slice2docbook.dsp
index a7662669371..57fbd1cf50f 100644
--- a/cpp/src/slice2docbook/slice2docbook.dsp
+++ b/cpp/src/slice2docbook/slice2docbook.dsp
@@ -25,7 +25,7 @@ CFG=slice2docbook - Win32 Debug
 # PROP AllowPerConfigDependencies 0
 # PROP Scc_ProjName ""
 # PROP Scc_LocalPath ""
-CPP=cl.exe
+CPP=xicl6.exe
 RSC=rc.exe
 
 !IF  "$(CFG)" == "slice2docbook - Win32 Release"
@@ -49,9 +49,9 @@ RSC=rc.exe
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
-LINK32=link.exe
+LINK32=xilink6.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 setargv.obj /nologo /subsystem:console /machine:I386 /out:"../../bin/slice2docbook.exe" /libpath:"../../lib"
+# ADD LINK32 setargv.obj /nologo /subsystem:console /machine:I386 /nodefaultlib /out:"../../bin/slice2docbook.exe" /libpath:"../../lib"
 # SUBTRACT LINK32 /debug
 
 !ELSEIF  "$(CFG)" == "slice2docbook - Win32 Debug"
@@ -75,9 +75,10 @@ LINK32=link.exe
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
-LINK32=link.exe
+LINK32=xilink6.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
 # ADD LINK32 setargv.obj /nologo /subsystem:console /debug /machine:I386 /out:"../../bin/slice2docbook.exe" /pdbtype:sept /libpath:"../../lib"
+# SUBTRACT LINK32 /nodefaultlib
 
 !ENDIF 
 
diff --git a/cpp/src/slice2freeze/slice2freeze.dsp b/cpp/src/slice2freeze/slice2freeze.dsp
index 7390bc63f9b..39cac059893 100644
--- a/cpp/src/slice2freeze/slice2freeze.dsp
+++ b/cpp/src/slice2freeze/slice2freeze.dsp
@@ -25,7 +25,7 @@ CFG=slice2freeze - Win32 Debug
 # PROP AllowPerConfigDependencies 0
 # PROP Scc_ProjName ""
 # PROP Scc_LocalPath ""
-CPP=cl.exe
+CPP=xicl6.exe
 RSC=rc.exe
 
 !IF  "$(CFG)" == "slice2freeze - Win32 Release"
@@ -49,9 +49,9 @@ RSC=rc.exe
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
-LINK32=link.exe
+LINK32=xilink6.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 setargv.obj /nologo /subsystem:console /machine:I386 /out:"../../bin/slice2freeze.exe" /libpath:"../../lib"
+# ADD LINK32 setargv.obj /nologo /subsystem:console /machine:I386 /nodefaultlib /out:"../../bin/slice2freeze.exe" /libpath:"../../lib"
 # SUBTRACT LINK32 /debug
 
 !ELSEIF  "$(CFG)" == "slice2freeze - Win32 Debug"
@@ -75,9 +75,10 @@ LINK32=link.exe
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
-LINK32=link.exe
+LINK32=xilink6.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
 # ADD LINK32 setargv.obj /nologo /subsystem:console /debug /machine:I386 /out:"../../bin/slice2freeze.exe" /pdbtype:sept /libpath:"../../lib"
+# SUBTRACT LINK32 /nodefaultlib
 
 !ENDIF 
 
diff --git a/cpp/src/slice2java/slice2java.dsp b/cpp/src/slice2java/slice2java.dsp
index 72f0efdc284..4613ea5dafa 100644
--- a/cpp/src/slice2java/slice2java.dsp
+++ b/cpp/src/slice2java/slice2java.dsp
@@ -25,7 +25,7 @@ CFG=slice2java - Win32 Debug
 # PROP AllowPerConfigDependencies 0
 # PROP Scc_ProjName ""
 # PROP Scc_LocalPath ""
-CPP=cl.exe
+CPP=xicl6.exe
 RSC=rc.exe
 
 !IF  "$(CFG)" == "slice2java - Win32 Release"
@@ -49,9 +49,9 @@ RSC=rc.exe
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
-LINK32=link.exe
+LINK32=xilink6.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 setargv.obj /nologo /subsystem:console /machine:I386 /out:"../../bin/slice2java.exe" /libpath:"../../lib"
+# ADD LINK32 setargv.obj /nologo /subsystem:console /machine:I386 /nodefaultlib /out:"../../bin/slice2java.exe" /libpath:"../../lib"
 
 !ELSEIF  "$(CFG)" == "slice2java - Win32 Debug"
 
@@ -74,9 +74,10 @@ LINK32=link.exe
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
-LINK32=link.exe
+LINK32=xilink6.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
 # ADD LINK32 setargv.obj /nologo /subsystem:console /debug /machine:I386 /out:"../../bin/slice2java.exe" /pdbtype:sept /libpath:"../../lib"
+# SUBTRACT LINK32 /nodefaultlib
 
 !ENDIF 
 
diff --git a/cpp/test/Freeze/complex/complex.dsp b/cpp/test/Freeze/complex/complex.dsp
index 4df38a62f97..a6db5a37a95 100644
--- a/cpp/test/Freeze/complex/complex.dsp
+++ b/cpp/test/Freeze/complex/complex.dsp
@@ -25,7 +25,7 @@ CFG=complex - Win32 Debug
 # PROP AllowPerConfigDependencies 0
 # PROP Scc_ProjName ""
 # PROP Scc_LocalPath ""
-CPP=cl.exe
+CPP=xicl6.exe
 RSC=rc.exe
 
 !IF  "$(CFG)" == "complex - Win32 Release"
@@ -49,9 +49,9 @@ RSC=rc.exe
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
-LINK32=link.exe
+LINK32=xilink6.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 /nologo /subsystem:console /machine:I386 /out:"client.exe" /libpath:"../../../lib"
+# ADD LINK32 /nologo /subsystem:console /machine:I386 /nodefaultlib /out:"client.exe" /libpath:"../../../lib"
 # SUBTRACT LINK32 /debug
 
 !ELSEIF  "$(CFG)" == "complex - Win32 Debug"
@@ -75,7 +75,7 @@ LINK32=link.exe
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
-LINK32=link.exe
+LINK32=xilink6.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
 # ADD LINK32 /nologo /subsystem:console /debug /machine:I386 /out:"client.exe" /pdbtype:sept /libpath:"../../../lib"
 # SUBTRACT LINK32 /nodefaultlib
diff --git a/cpp/test/Freeze/cursor/cursor.dsp b/cpp/test/Freeze/cursor/cursor.dsp
index d1eaf61f1d7..25d363d7963 100644
--- a/cpp/test/Freeze/cursor/cursor.dsp
+++ b/cpp/test/Freeze/cursor/cursor.dsp
@@ -25,7 +25,7 @@ CFG=cursor - Win32 Debug
 # PROP AllowPerConfigDependencies 0
 # PROP Scc_ProjName ""
 # PROP Scc_LocalPath ""
-CPP=cl.exe
+CPP=xicl6.exe
 RSC=rc.exe
 
 !IF  "$(CFG)" == "cursor - Win32 Release"
@@ -49,9 +49,9 @@ RSC=rc.exe
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
-LINK32=link.exe
+LINK32=xilink6.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 /nologo /subsystem:console /machine:I386 /out:"client.exe" /libpath:"../../../lib"
+# ADD LINK32 /nologo /subsystem:console /machine:I386 /nodefaultlib /out:"client.exe" /libpath:"../../../lib"
 # SUBTRACT LINK32 /debug
 
 !ELSEIF  "$(CFG)" == "cursor - Win32 Debug"
@@ -75,7 +75,7 @@ LINK32=link.exe
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
-LINK32=link.exe
+LINK32=xilink6.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
 # ADD LINK32 /nologo /subsystem:console /debug /machine:I386 /out:"client.exe" /pdbtype:sept /libpath:"../../../lib"
 # SUBTRACT LINK32 /nodefaultlib
diff --git a/cpp/test/Freeze/dbmap/dbmap.dsp b/cpp/test/Freeze/dbmap/dbmap.dsp
index 41842dda056..aaea3b565ec 100644
--- a/cpp/test/Freeze/dbmap/dbmap.dsp
+++ b/cpp/test/Freeze/dbmap/dbmap.dsp
@@ -25,7 +25,7 @@ CFG=dbmap - Win32 Debug
 # PROP AllowPerConfigDependencies 0
 # PROP Scc_ProjName ""
 # PROP Scc_LocalPath ""
-CPP=cl.exe
+CPP=xicl6.exe
 RSC=rc.exe
 
 !IF  "$(CFG)" == "dbmap - Win32 Release"
@@ -49,9 +49,9 @@ RSC=rc.exe
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
-LINK32=link.exe
+LINK32=xilink6.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 /nologo /subsystem:console /machine:I386 /out:"client.exe" /libpath:"../../../lib"
+# ADD LINK32 /nologo /subsystem:console /machine:I386 /nodefaultlib /out:"client.exe" /libpath:"../../../lib"
 # SUBTRACT LINK32 /debug
 
 !ELSEIF  "$(CFG)" == "dbmap - Win32 Debug"
@@ -75,7 +75,7 @@ LINK32=link.exe
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
-LINK32=link.exe
+LINK32=xilink6.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
 # ADD LINK32 /nologo /subsystem:console /debug /machine:I386 /out:"client.exe" /pdbtype:sept /libpath:"../../../lib"
 # SUBTRACT LINK32 /nodefaultlib
diff --git a/cpp/test/Ice/exceptions/exceptionsC.dsp b/cpp/test/Ice/exceptions/exceptionsC.dsp
index fc1f6cd1b6c..76171779b3b 100644
--- a/cpp/test/Ice/exceptions/exceptionsC.dsp
+++ b/cpp/test/Ice/exceptions/exceptionsC.dsp
@@ -25,7 +25,7 @@ CFG=exceptionsC - Win32 Debug
 # PROP AllowPerConfigDependencies 0
 # PROP Scc_ProjName ""
 # PROP Scc_LocalPath ""
-CPP=cl.exe
+CPP=xicl6.exe
 RSC=rc.exe
 
 !IF  "$(CFG)" == "exceptionsC - Win32 Release"
@@ -49,9 +49,9 @@ RSC=rc.exe
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
-LINK32=link.exe
+LINK32=xilink6.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 /nologo /subsystem:console /machine:I386 /out:"client.exe" /libpath:"../../../lib"
+# ADD LINK32 /nologo /subsystem:console /machine:I386 /nodefaultlib /out:"client.exe" /libpath:"../../../lib"
 # SUBTRACT LINK32 /debug
 
 !ELSEIF  "$(CFG)" == "exceptionsC - Win32 Debug"
@@ -75,9 +75,10 @@ LINK32=link.exe
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
-LINK32=link.exe
+LINK32=xilink6.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
 # ADD LINK32 /nologo /subsystem:console /debug /machine:I386 /out:"client.exe" /pdbtype:sept /libpath:"../../../lib"
+# SUBTRACT LINK32 /nodefaultlib
 
 !ENDIF 
 
diff --git a/cpp/test/Ice/exceptions/exceptionsCOL.dsp b/cpp/test/Ice/exceptions/exceptionsCOL.dsp
index 4a27d0fe54a..4a0a9c4f23e 100644
--- a/cpp/test/Ice/exceptions/exceptionsCOL.dsp
+++ b/cpp/test/Ice/exceptions/exceptionsCOL.dsp
@@ -25,7 +25,7 @@ CFG=exceptionsCOL - Win32 Debug
 # PROP AllowPerConfigDependencies 0
 # PROP Scc_ProjName ""
 # PROP Scc_LocalPath ""
-CPP=cl.exe
+CPP=xicl6.exe
 RSC=rc.exe
 
 !IF  "$(CFG)" == "exceptionsCOL - Win32 Release"
@@ -49,9 +49,9 @@ RSC=rc.exe
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
-LINK32=link.exe
+LINK32=xilink6.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 /nologo /subsystem:console /machine:I386 /out:"collocated.exe" /libpath:"../../../lib"
+# ADD LINK32 /nologo /subsystem:console /machine:I386 /nodefaultlib /out:"collocated.exe" /libpath:"../../../lib"
 # SUBTRACT LINK32 /debug
 
 !ELSEIF  "$(CFG)" == "exceptionsCOL - Win32 Debug"
@@ -75,9 +75,10 @@ LINK32=link.exe
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
-LINK32=link.exe
+LINK32=xilink6.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
 # ADD LINK32 /nologo /subsystem:console /debug /machine:I386 /out:"collocated.exe" /pdbtype:sept /libpath:"../../../lib"
+# SUBTRACT LINK32 /nodefaultlib
 
 !ENDIF 
 
diff --git a/cpp/test/Ice/exceptions/exceptionsS.dsp b/cpp/test/Ice/exceptions/exceptionsS.dsp
index 409579f1bde..a673e25aea3 100644
--- a/cpp/test/Ice/exceptions/exceptionsS.dsp
+++ b/cpp/test/Ice/exceptions/exceptionsS.dsp
@@ -25,7 +25,7 @@ CFG=exceptionsS - Win32 Debug
 # PROP AllowPerConfigDependencies 0
 # PROP Scc_ProjName ""
 # PROP Scc_LocalPath ""
-CPP=cl.exe
+CPP=xicl6.exe
 RSC=rc.exe
 
 !IF  "$(CFG)" == "exceptionsS - Win32 Release"
@@ -49,9 +49,9 @@ RSC=rc.exe
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
-LINK32=link.exe
+LINK32=xilink6.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 /nologo /subsystem:console /machine:I386 /out:"server.exe" /libpath:"../../../lib"
+# ADD LINK32 /nologo /subsystem:console /machine:I386 /nodefaultlib /out:"server.exe" /libpath:"../../../lib"
 # SUBTRACT LINK32 /debug
 
 !ELSEIF  "$(CFG)" == "exceptionsS - Win32 Debug"
@@ -75,9 +75,10 @@ LINK32=link.exe
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
-LINK32=link.exe
+LINK32=xilink6.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
 # ADD LINK32 /nologo /subsystem:console /debug /machine:I386 /out:"server.exe" /pdbtype:sept /libpath:"../../../lib"
+# SUBTRACT LINK32 /nodefaultlib
 
 !ENDIF 
 
diff --git a/cpp/test/Ice/facets/facetsC.dsp b/cpp/test/Ice/facets/facetsC.dsp
index 852ad6cb644..1e4f3d85db7 100644
--- a/cpp/test/Ice/facets/facetsC.dsp
+++ b/cpp/test/Ice/facets/facetsC.dsp
@@ -25,7 +25,7 @@ CFG=facetsC - Win32 Debug
 # PROP AllowPerConfigDependencies 0
 # PROP Scc_ProjName ""
 # PROP Scc_LocalPath ""
-CPP=cl.exe
+CPP=xicl6.exe
 RSC=rc.exe
 
 !IF  "$(CFG)" == "facetsC - Win32 Release"
@@ -49,9 +49,9 @@ RSC=rc.exe
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
-LINK32=link.exe
+LINK32=xilink6.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 /nologo /subsystem:console /machine:I386 /out:"client.exe" /libpath:"../../../lib"
+# ADD LINK32 /nologo /subsystem:console /machine:I386 /nodefaultlib /out:"client.exe" /libpath:"../../../lib"
 # SUBTRACT LINK32 /debug
 
 !ELSEIF  "$(CFG)" == "facetsC - Win32 Debug"
@@ -75,9 +75,10 @@ LINK32=link.exe
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
-LINK32=link.exe
+LINK32=xilink6.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
 # ADD LINK32 /nologo /subsystem:console /debug /machine:I386 /out:"client.exe" /pdbtype:sept /libpath:"../../../lib"
+# SUBTRACT LINK32 /nodefaultlib
 
 !ENDIF 
 
diff --git a/cpp/test/Ice/facets/facetsCOL.dsp b/cpp/test/Ice/facets/facetsCOL.dsp
index e38d788b264..889df56b6f0 100644
--- a/cpp/test/Ice/facets/facetsCOL.dsp
+++ b/cpp/test/Ice/facets/facetsCOL.dsp
@@ -25,7 +25,7 @@ CFG=facetsCOL - Win32 Debug
 # PROP AllowPerConfigDependencies 0
 # PROP Scc_ProjName ""
 # PROP Scc_LocalPath ""
-CPP=cl.exe
+CPP=xicl6.exe
 RSC=rc.exe
 
 !IF  "$(CFG)" == "facetsCOL - Win32 Release"
@@ -49,9 +49,9 @@ RSC=rc.exe
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
-LINK32=link.exe
+LINK32=xilink6.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 /nologo /subsystem:console /machine:I386 /out:"collocated.exe" /libpath:"../../../lib"
+# ADD LINK32 /nologo /subsystem:console /machine:I386 /nodefaultlib /out:"collocated.exe" /libpath:"../../../lib"
 # SUBTRACT LINK32 /debug
 
 !ELSEIF  "$(CFG)" == "facetsCOL - Win32 Debug"
@@ -75,9 +75,10 @@ LINK32=link.exe
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
-LINK32=link.exe
+LINK32=xilink6.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
 # ADD LINK32 /nologo /subsystem:console /debug /machine:I386 /out:"collocated.exe" /pdbtype:sept /libpath:"../../../lib"
+# SUBTRACT LINK32 /nodefaultlib
 
 !ENDIF 
 
diff --git a/cpp/test/Ice/facets/facetsS.dsp b/cpp/test/Ice/facets/facetsS.dsp
index c6deafddc9e..4adad8482a2 100644
--- a/cpp/test/Ice/facets/facetsS.dsp
+++ b/cpp/test/Ice/facets/facetsS.dsp
@@ -25,7 +25,7 @@ CFG=facetsS - Win32 Debug
 # PROP AllowPerConfigDependencies 0
 # PROP Scc_ProjName ""
 # PROP Scc_LocalPath ""
-CPP=cl.exe
+CPP=xicl6.exe
 RSC=rc.exe
 
 !IF  "$(CFG)" == "facetsS - Win32 Release"
@@ -49,9 +49,9 @@ RSC=rc.exe
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
-LINK32=link.exe
+LINK32=xilink6.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 /nologo /subsystem:console /machine:I386 /out:"server.exe" /libpath:"../../../lib"
+# ADD LINK32 /nologo /subsystem:console /machine:I386 /nodefaultlib /out:"server.exe" /libpath:"../../../lib"
 # SUBTRACT LINK32 /debug
 
 !ELSEIF  "$(CFG)" == "facetsS - Win32 Debug"
@@ -75,9 +75,10 @@ LINK32=link.exe
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
-LINK32=link.exe
+LINK32=xilink6.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
 # ADD LINK32 /nologo /subsystem:console /debug /machine:I386 /out:"server.exe" /pdbtype:sept /libpath:"../../../lib"
+# SUBTRACT LINK32 /nodefaultlib
 
 !ENDIF 
 
diff --git a/cpp/test/Ice/faultTolerance/faulttoleranceC.dsp b/cpp/test/Ice/faultTolerance/faulttoleranceC.dsp
index e0a1664d365..f2aa596e7b8 100644
--- a/cpp/test/Ice/faultTolerance/faulttoleranceC.dsp
+++ b/cpp/test/Ice/faultTolerance/faulttoleranceC.dsp
@@ -25,7 +25,7 @@ CFG=faultToleranceC - Win32 Debug
 # PROP AllowPerConfigDependencies 0
 # PROP Scc_ProjName ""
 # PROP Scc_LocalPath ""
-CPP=cl.exe
+CPP=xicl6.exe
 RSC=rc.exe
 
 !IF  "$(CFG)" == "faultToleranceC - Win32 Release"
@@ -49,9 +49,9 @@ RSC=rc.exe
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
-LINK32=link.exe
+LINK32=xilink6.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 /nologo /subsystem:console /machine:I386 /out:"client.exe" /libpath:"../../../lib"
+# ADD LINK32 /nologo /subsystem:console /machine:I386 /nodefaultlib /out:"client.exe" /libpath:"../../../lib"
 # SUBTRACT LINK32 /debug
 
 !ELSEIF  "$(CFG)" == "faultToleranceC - Win32 Debug"
@@ -75,9 +75,10 @@ LINK32=link.exe
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
-LINK32=link.exe
+LINK32=xilink6.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
 # ADD LINK32 /nologo /subsystem:console /debug /machine:I386 /out:"client.exe" /pdbtype:sept /libpath:"../../../lib"
+# SUBTRACT LINK32 /nodefaultlib
 
 !ENDIF 
 
diff --git a/cpp/test/Ice/faultTolerance/faulttoleranceS.dsp b/cpp/test/Ice/faultTolerance/faulttoleranceS.dsp
index 8f354ad4810..684243e0049 100644
--- a/cpp/test/Ice/faultTolerance/faulttoleranceS.dsp
+++ b/cpp/test/Ice/faultTolerance/faulttoleranceS.dsp
@@ -25,7 +25,7 @@ CFG=faultToleranceS - Win32 Debug
 # PROP AllowPerConfigDependencies 0
 # PROP Scc_ProjName ""
 # PROP Scc_LocalPath ""
-CPP=cl.exe
+CPP=xicl6.exe
 RSC=rc.exe
 
 !IF  "$(CFG)" == "faultToleranceS - Win32 Release"
@@ -49,9 +49,9 @@ RSC=rc.exe
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
-LINK32=link.exe
+LINK32=xilink6.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 /nologo /subsystem:console /machine:I386 /out:"server.exe" /libpath:"../../../lib"
+# ADD LINK32 /nologo /subsystem:console /machine:I386 /nodefaultlib /out:"server.exe" /libpath:"../../../lib"
 # SUBTRACT LINK32 /debug
 
 !ELSEIF  "$(CFG)" == "faultToleranceS - Win32 Debug"
@@ -75,9 +75,10 @@ LINK32=link.exe
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
-LINK32=link.exe
+LINK32=xilink6.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
 # ADD LINK32 /nologo /subsystem:console /debug /machine:I386 /out:"server.exe" /pdbtype:sept /libpath:"../../../lib"
+# SUBTRACT LINK32 /nodefaultlib
 
 !ENDIF 
 
diff --git a/cpp/test/Ice/inheritance/inheritanceC.dsp b/cpp/test/Ice/inheritance/inheritanceC.dsp
index 7801ec97525..065b80efa1c 100644
--- a/cpp/test/Ice/inheritance/inheritanceC.dsp
+++ b/cpp/test/Ice/inheritance/inheritanceC.dsp
@@ -25,7 +25,7 @@ CFG=inheritanceC - Win32 Debug
 # PROP AllowPerConfigDependencies 0
 # PROP Scc_ProjName ""
 # PROP Scc_LocalPath ""
-CPP=cl.exe
+CPP=xicl6.exe
 RSC=rc.exe
 
 !IF  "$(CFG)" == "inheritanceC - Win32 Release"
@@ -49,9 +49,9 @@ RSC=rc.exe
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
-LINK32=link.exe
+LINK32=xilink6.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 /nologo /subsystem:console /machine:I386 /out:"client.exe" /libpath:"../../../lib"
+# ADD LINK32 /nologo /subsystem:console /machine:I386 /nodefaultlib /out:"client.exe" /libpath:"../../../lib"
 # SUBTRACT LINK32 /debug
 
 !ELSEIF  "$(CFG)" == "inheritanceC - Win32 Debug"
@@ -75,9 +75,10 @@ LINK32=link.exe
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
-LINK32=link.exe
+LINK32=xilink6.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32  /nologo /subsystem:console /debug /machine:I386 /out:"client.exe" /pdbtype:sept /libpath:"../../../lib"
+# ADD LINK32 /nologo /subsystem:console /debug /machine:I386 /out:"client.exe" /pdbtype:sept /libpath:"../../../lib"
+# SUBTRACT LINK32 /nodefaultlib
 
 !ENDIF 
 
diff --git a/cpp/test/Ice/inheritance/inheritanceCOL.dsp b/cpp/test/Ice/inheritance/inheritanceCOL.dsp
index cbdd81941ca..73bdc5202a1 100644
--- a/cpp/test/Ice/inheritance/inheritanceCOL.dsp
+++ b/cpp/test/Ice/inheritance/inheritanceCOL.dsp
@@ -25,7 +25,7 @@ CFG=inheritanceCOL - Win32 Debug
 # PROP AllowPerConfigDependencies 0
 # PROP Scc_ProjName ""
 # PROP Scc_LocalPath ""
-CPP=cl.exe
+CPP=xicl6.exe
 RSC=rc.exe
 
 !IF  "$(CFG)" == "inheritanceCOL - Win32 Release"
@@ -49,9 +49,9 @@ RSC=rc.exe
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
-LINK32=link.exe
+LINK32=xilink6.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 /nologo /subsystem:console /machine:I386 /out:"collocated.exe" /libpath:"../../../lib"
+# ADD LINK32 /nologo /subsystem:console /machine:I386 /nodefaultlib /out:"collocated.exe" /libpath:"../../../lib"
 # SUBTRACT LINK32 /debug
 
 !ELSEIF  "$(CFG)" == "inheritanceCOL - Win32 Debug"
@@ -75,9 +75,10 @@ LINK32=link.exe
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
-LINK32=link.exe
+LINK32=xilink6.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
 # ADD LINK32 /nologo /subsystem:console /debug /machine:I386 /out:"collocated.exe" /pdbtype:sept /libpath:"../../../lib"
+# SUBTRACT LINK32 /nodefaultlib
 
 !ENDIF 
 
diff --git a/cpp/test/Ice/inheritance/inheritanceS.dsp b/cpp/test/Ice/inheritance/inheritanceS.dsp
index 59d9bd6e975..47a8151099d 100644
--- a/cpp/test/Ice/inheritance/inheritanceS.dsp
+++ b/cpp/test/Ice/inheritance/inheritanceS.dsp
@@ -25,7 +25,7 @@ CFG=inheritanceS - Win32 Debug
 # PROP AllowPerConfigDependencies 0
 # PROP Scc_ProjName ""
 # PROP Scc_LocalPath ""
-CPP=cl.exe
+CPP=xicl6.exe
 RSC=rc.exe
 
 !IF  "$(CFG)" == "inheritanceS - Win32 Release"
@@ -49,9 +49,9 @@ RSC=rc.exe
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
-LINK32=link.exe
+LINK32=xilink6.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 /nologo /subsystem:console /machine:I386 /out:"server.exe" /libpath:"../../../lib"
+# ADD LINK32 /nologo /subsystem:console /machine:I386 /nodefaultlib /out:"server.exe" /libpath:"../../../lib"
 # SUBTRACT LINK32 /debug
 
 !ELSEIF  "$(CFG)" == "inheritanceS - Win32 Debug"
@@ -75,9 +75,10 @@ LINK32=link.exe
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
-LINK32=link.exe
+LINK32=xilink6.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
 # ADD LINK32 /nologo /subsystem:console /debug /machine:I386 /out:"server.exe" /pdbtype:sept /libpath:"../../../lib"
+# SUBTRACT LINK32 /nodefaultlib
 
 !ENDIF 
 
diff --git a/cpp/test/Ice/locationForward/locationforwardC.dsp b/cpp/test/Ice/locationForward/locationforwardC.dsp
index 0b89071baeb..e0bb2d6c267 100644
--- a/cpp/test/Ice/locationForward/locationforwardC.dsp
+++ b/cpp/test/Ice/locationForward/locationforwardC.dsp
@@ -25,7 +25,7 @@ CFG=locationForwardC - Win32 Debug
 # PROP AllowPerConfigDependencies 0
 # PROP Scc_ProjName ""
 # PROP Scc_LocalPath ""
-CPP=cl.exe
+CPP=xicl6.exe
 RSC=rc.exe
 
 !IF  "$(CFG)" == "locationForwardC - Win32 Release"
@@ -49,9 +49,9 @@ RSC=rc.exe
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
-LINK32=link.exe
+LINK32=xilink6.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 /nologo /subsystem:console /machine:I386 /out:"client.exe" /libpath:"../../../lib"
+# ADD LINK32 /nologo /subsystem:console /machine:I386 /nodefaultlib /out:"client.exe" /libpath:"../../../lib"
 # SUBTRACT LINK32 /debug
 
 !ELSEIF  "$(CFG)" == "locationForwardC - Win32 Debug"
@@ -75,9 +75,10 @@ LINK32=link.exe
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
-LINK32=link.exe
+LINK32=xilink6.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
 # ADD LINK32 /nologo /subsystem:console /debug /machine:I386 /out:"client.exe" /pdbtype:sept /libpath:"../../../lib"
+# SUBTRACT LINK32 /nodefaultlib
 
 !ENDIF 
 
diff --git a/cpp/test/Ice/locationForward/locationforwardS.dsp b/cpp/test/Ice/locationForward/locationforwardS.dsp
index b45903099cf..885b92c7974 100644
--- a/cpp/test/Ice/locationForward/locationforwardS.dsp
+++ b/cpp/test/Ice/locationForward/locationforwardS.dsp
@@ -25,7 +25,7 @@ CFG=locationForwardS - Win32 Debug
 # PROP AllowPerConfigDependencies 0
 # PROP Scc_ProjName ""
 # PROP Scc_LocalPath ""
-CPP=cl.exe
+CPP=xicl6.exe
 RSC=rc.exe
 
 !IF  "$(CFG)" == "locationForwardS - Win32 Release"
@@ -49,9 +49,9 @@ RSC=rc.exe
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
-LINK32=link.exe
+LINK32=xilink6.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 /nologo /subsystem:console /machine:I386 /out:"server.exe" /libpath:"../../../lib"
+# ADD LINK32 /nologo /subsystem:console /machine:I386 /nodefaultlib /out:"server.exe" /libpath:"../../../lib"
 # SUBTRACT LINK32 /debug
 
 !ELSEIF  "$(CFG)" == "locationForwardS - Win32 Debug"
@@ -75,9 +75,10 @@ LINK32=link.exe
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
-LINK32=link.exe
+LINK32=xilink6.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
 # ADD LINK32 /nologo /subsystem:console /debug /machine:I386 /out:"server.exe" /pdbtype:sept /libpath:"../../../lib"
+# SUBTRACT LINK32 /nodefaultlib
 
 !ENDIF 
 
diff --git a/cpp/test/Ice/objects/objectsC.dsp b/cpp/test/Ice/objects/objectsC.dsp
index 6f16c2b859f..e683f033cc5 100644
--- a/cpp/test/Ice/objects/objectsC.dsp
+++ b/cpp/test/Ice/objects/objectsC.dsp
@@ -25,7 +25,7 @@ CFG=objectsC - Win32 Debug
 # PROP AllowPerConfigDependencies 0
 # PROP Scc_ProjName ""
 # PROP Scc_LocalPath ""
-CPP=cl.exe
+CPP=xicl6.exe
 RSC=rc.exe
 
 !IF  "$(CFG)" == "objectsC - Win32 Release"
@@ -49,9 +49,9 @@ RSC=rc.exe
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
-LINK32=link.exe
+LINK32=xilink6.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 /nologo /subsystem:console /machine:I386 /out:"client.exe" /libpath:"../../../lib"
+# ADD LINK32 /nologo /subsystem:console /machine:I386 /nodefaultlib /out:"client.exe" /libpath:"../../../lib"
 # SUBTRACT LINK32 /debug
 
 !ELSEIF  "$(CFG)" == "objectsC - Win32 Debug"
@@ -75,9 +75,10 @@ LINK32=link.exe
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
-LINK32=link.exe
+LINK32=xilink6.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
 # ADD LINK32 /nologo /subsystem:console /debug /machine:I386 /out:"client.exe" /pdbtype:sept /libpath:"../../../lib"
+# SUBTRACT LINK32 /nodefaultlib
 
 !ENDIF 
 
diff --git a/cpp/test/Ice/objects/objectsCOL.dsp b/cpp/test/Ice/objects/objectsCOL.dsp
index b6026c62916..82d01e45816 100644
--- a/cpp/test/Ice/objects/objectsCOL.dsp
+++ b/cpp/test/Ice/objects/objectsCOL.dsp
@@ -25,7 +25,7 @@ CFG=objectsCOL - Win32 Debug
 # PROP AllowPerConfigDependencies 0
 # PROP Scc_ProjName ""
 # PROP Scc_LocalPath ""
-CPP=cl.exe
+CPP=xicl6.exe
 RSC=rc.exe
 
 !IF  "$(CFG)" == "objectsCOL - Win32 Release"
@@ -49,9 +49,9 @@ RSC=rc.exe
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
-LINK32=link.exe
+LINK32=xilink6.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 /nologo /subsystem:console /machine:I386 /out:"collocated.exe" /libpath:"../../../lib"
+# ADD LINK32 /nologo /subsystem:console /machine:I386 /nodefaultlib /out:"collocated.exe" /libpath:"../../../lib"
 # SUBTRACT LINK32 /debug
 
 !ELSEIF  "$(CFG)" == "objectsCOL - Win32 Debug"
@@ -75,9 +75,10 @@ LINK32=link.exe
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
-LINK32=link.exe
+LINK32=xilink6.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
 # ADD LINK32 /nologo /subsystem:console /debug /machine:I386 /out:"collocated.exe" /pdbtype:sept /libpath:"../../../lib"
+# SUBTRACT LINK32 /nodefaultlib
 
 !ENDIF 
 
diff --git a/cpp/test/Ice/objects/objectsS.dsp b/cpp/test/Ice/objects/objectsS.dsp
index fa6f4e9ee66..ad39a2f23b3 100644
--- a/cpp/test/Ice/objects/objectsS.dsp
+++ b/cpp/test/Ice/objects/objectsS.dsp
@@ -25,7 +25,7 @@ CFG=objectsS - Win32 Debug
 # PROP AllowPerConfigDependencies 0
 # PROP Scc_ProjName ""
 # PROP Scc_LocalPath ""
-CPP=cl.exe
+CPP=xicl6.exe
 RSC=rc.exe
 
 !IF  "$(CFG)" == "objectsS - Win32 Release"
@@ -49,9 +49,9 @@ RSC=rc.exe
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
-LINK32=link.exe
+LINK32=xilink6.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 /nologo /subsystem:console /machine:I386 /out:"server.exe" /libpath:"../../../lib"
+# ADD LINK32 /nologo /subsystem:console /machine:I386 /nodefaultlib /out:"server.exe" /libpath:"../../../lib"
 # SUBTRACT LINK32 /debug
 
 !ELSEIF  "$(CFG)" == "objectsS - Win32 Debug"
@@ -75,9 +75,10 @@ LINK32=link.exe
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
-LINK32=link.exe
+LINK32=xilink6.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
 # ADD LINK32 /nologo /subsystem:console /debug /machine:I386 /out:"server.exe" /pdbtype:sept /libpath:"../../../lib"
+# SUBTRACT LINK32 /nodefaultlib
 
 !ENDIF 
 
diff --git a/cpp/test/Ice/operations/operationsC.dsp b/cpp/test/Ice/operations/operationsC.dsp
index 67534334350..2093a4a939e 100644
--- a/cpp/test/Ice/operations/operationsC.dsp
+++ b/cpp/test/Ice/operations/operationsC.dsp
@@ -25,7 +25,7 @@ CFG=operationsC - Win32 Debug
 # PROP AllowPerConfigDependencies 0
 # PROP Scc_ProjName ""
 # PROP Scc_LocalPath ""
-CPP=cl.exe
+CPP=xicl6.exe
 RSC=rc.exe
 
 !IF  "$(CFG)" == "operationsC - Win32 Release"
@@ -49,9 +49,9 @@ RSC=rc.exe
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
-LINK32=link.exe
+LINK32=xilink6.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 /nologo /subsystem:console /machine:I386 /out:"client.exe" /libpath:"../../../lib"
+# ADD LINK32 /nologo /subsystem:console /machine:I386 /nodefaultlib /out:"client.exe" /libpath:"../../../lib"
 # SUBTRACT LINK32 /debug
 
 !ELSEIF  "$(CFG)" == "operationsC - Win32 Debug"
@@ -75,7 +75,7 @@ LINK32=link.exe
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
-LINK32=link.exe
+LINK32=xilink6.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
 # ADD LINK32 /nologo /subsystem:console /debug /machine:I386 /out:"client.exe" /pdbtype:sept /libpath:"../../../lib"
 # SUBTRACT LINK32 /nodefaultlib
diff --git a/cpp/test/Ice/operations/operationsCOL.dsp b/cpp/test/Ice/operations/operationsCOL.dsp
index f493a3de481..617b871b651 100644
--- a/cpp/test/Ice/operations/operationsCOL.dsp
+++ b/cpp/test/Ice/operations/operationsCOL.dsp
@@ -25,7 +25,7 @@ CFG=operationsCOL - Win32 Debug
 # PROP AllowPerConfigDependencies 0
 # PROP Scc_ProjName ""
 # PROP Scc_LocalPath ""
-CPP=cl.exe
+CPP=xicl6.exe
 RSC=rc.exe
 
 !IF  "$(CFG)" == "operationsCOL - Win32 Release"
@@ -49,9 +49,9 @@ RSC=rc.exe
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
-LINK32=link.exe
+LINK32=xilink6.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 /nologo /subsystem:console /machine:I386 /out:"collocated.exe" /libpath:"../../../lib"
+# ADD LINK32 /nologo /subsystem:console /machine:I386 /nodefaultlib /out:"collocated.exe" /libpath:"../../../lib"
 # SUBTRACT LINK32 /debug
 
 !ELSEIF  "$(CFG)" == "operationsCOL - Win32 Debug"
@@ -75,9 +75,10 @@ LINK32=link.exe
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
-LINK32=link.exe
+LINK32=xilink6.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
 # ADD LINK32 /nologo /subsystem:console /debug /machine:I386 /out:"collocated.exe" /pdbtype:sept /libpath:"../../../lib"
+# SUBTRACT LINK32 /nodefaultlib
 
 !ENDIF 
 
diff --git a/cpp/test/Ice/operations/operationsS.dsp b/cpp/test/Ice/operations/operationsS.dsp
index f0f8859c503..bf2965cc23d 100644
--- a/cpp/test/Ice/operations/operationsS.dsp
+++ b/cpp/test/Ice/operations/operationsS.dsp
@@ -25,7 +25,7 @@ CFG=operationsS - Win32 Debug
 # PROP AllowPerConfigDependencies 0
 # PROP Scc_ProjName ""
 # PROP Scc_LocalPath ""
-CPP=cl.exe
+CPP=xicl6.exe
 RSC=rc.exe
 
 !IF  "$(CFG)" == "operationsS - Win32 Release"
@@ -49,9 +49,9 @@ RSC=rc.exe
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
-LINK32=link.exe
+LINK32=xilink6.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 /nologo /subsystem:console /machine:I386 /out:"server.exe" /libpath:"../../../lib"
+# ADD LINK32 /nologo /subsystem:console /machine:I386 /nodefaultlib /out:"server.exe" /libpath:"../../../lib"
 # SUBTRACT LINK32 /debug
 
 !ELSEIF  "$(CFG)" == "operationsS - Win32 Debug"
@@ -75,9 +75,10 @@ LINK32=link.exe
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
-LINK32=link.exe
+LINK32=xilink6.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
 # ADD LINK32 /nologo /subsystem:console /debug /machine:I386 /out:"server.exe" /pdbtype:sept /libpath:"../../../lib"
+# SUBTRACT LINK32 /nodefaultlib
 
 !ENDIF 
 
diff --git a/cpp/test/IcePack/simple/simpleC.dsp b/cpp/test/IcePack/simple/simpleC.dsp
index 37c3b2c5fa8..f25a6cb2915 100644
--- a/cpp/test/IcePack/simple/simpleC.dsp
+++ b/cpp/test/IcePack/simple/simpleC.dsp
@@ -25,7 +25,7 @@ CFG=simpleC - Win32 Debug
 # PROP AllowPerConfigDependencies 0
 # PROP Scc_ProjName ""
 # PROP Scc_LocalPath ""
-CPP=cl.exe
+CPP=xicl6.exe
 RSC=rc.exe
 
 !IF  "$(CFG)" == "simpleC - Win32 Release"
@@ -49,9 +49,9 @@ RSC=rc.exe
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
-LINK32=link.exe
+LINK32=xilink6.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 /nologo /subsystem:console /machine:I386 /out:"client.exe" /libpath:"../../../lib"
+# ADD LINK32 /nologo /subsystem:console /machine:I386 /nodefaultlib /out:"client.exe" /libpath:"../../../lib"
 # SUBTRACT LINK32 /debug
 
 !ELSEIF  "$(CFG)" == "simpleC - Win32 Debug"
@@ -75,9 +75,10 @@ LINK32=link.exe
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
-LINK32=link.exe
+LINK32=xilink6.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
 # ADD LINK32 /nologo /subsystem:console /debug /machine:I386 /out:"client.exe" /pdbtype:sept /libpath:"../../../lib"
+# SUBTRACT LINK32 /nodefaultlib
 
 !ENDIF 
 
diff --git a/cpp/test/IcePack/simple/simpleCOL.dsp b/cpp/test/IcePack/simple/simpleCOL.dsp
index 1ec91ae9e71..d5f5b743cd2 100644
--- a/cpp/test/IcePack/simple/simpleCOL.dsp
+++ b/cpp/test/IcePack/simple/simpleCOL.dsp
@@ -25,7 +25,7 @@ CFG=simpleCOL - Win32 Debug
 # PROP AllowPerConfigDependencies 0
 # PROP Scc_ProjName ""
 # PROP Scc_LocalPath ""
-CPP=cl.exe
+CPP=xicl6.exe
 RSC=rc.exe
 
 !IF  "$(CFG)" == "simpleCOL - Win32 Release"
@@ -49,9 +49,9 @@ RSC=rc.exe
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
-LINK32=link.exe
+LINK32=xilink6.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 /nologo /subsystem:console /machine:I386 /out:"collocated.exe" /libpath:"../../../lib"
+# ADD LINK32 /nologo /subsystem:console /machine:I386 /nodefaultlib /out:"collocated.exe" /libpath:"../../../lib"
 # SUBTRACT LINK32 /debug
 
 !ELSEIF  "$(CFG)" == "simpleCOL - Win32 Debug"
@@ -75,9 +75,10 @@ LINK32=link.exe
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
-LINK32=link.exe
+LINK32=xilink6.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
 # ADD LINK32 /nologo /subsystem:console /debug /machine:I386 /out:"collocated.exe" /pdbtype:sept /libpath:"../../../lib"
+# SUBTRACT LINK32 /nodefaultlib
 
 !ENDIF 
 
diff --git a/cpp/test/IcePack/simple/simpleS.dsp b/cpp/test/IcePack/simple/simpleS.dsp
index 044d12af855..91b0ba33187 100644
--- a/cpp/test/IcePack/simple/simpleS.dsp
+++ b/cpp/test/IcePack/simple/simpleS.dsp
@@ -25,7 +25,7 @@ CFG=simpleS - Win32 Debug
 # PROP AllowPerConfigDependencies 0
 # PROP Scc_ProjName ""
 # PROP Scc_LocalPath ""
-CPP=cl.exe
+CPP=xicl6.exe
 RSC=rc.exe
 
 !IF  "$(CFG)" == "simpleS - Win32 Release"
@@ -49,9 +49,9 @@ RSC=rc.exe
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
-LINK32=link.exe
+LINK32=xilink6.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 /nologo /subsystem:console /machine:I386 /out:"server.exe" /libpath:"../../../lib"
+# ADD LINK32 /nologo /subsystem:console /machine:I386 /nodefaultlib /out:"server.exe" /libpath:"../../../lib"
 # SUBTRACT LINK32 /debug
 
 !ELSEIF  "$(CFG)" == "simpleS - Win32 Debug"
@@ -75,9 +75,10 @@ LINK32=link.exe
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
-LINK32=link.exe
+LINK32=xilink6.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
 # ADD LINK32 /nologo /subsystem:console /debug /machine:I386 /out:"server.exe" /pdbtype:sept /libpath:"../../../lib"
+# SUBTRACT LINK32 /nodefaultlib
 
 !ENDIF 
 
diff --git a/cpp/test/IceStorm/federation/federationC.dsp b/cpp/test/IceStorm/federation/federationC.dsp
index 2566ebb2789..8247cc263ed 100644
--- a/cpp/test/IceStorm/federation/federationC.dsp
+++ b/cpp/test/IceStorm/federation/federationC.dsp
@@ -25,7 +25,7 @@ CFG=federationC - Win32 Debug
 # PROP AllowPerConfigDependencies 0
 # PROP Scc_ProjName ""
 # PROP Scc_LocalPath ""
-CPP=cl.exe
+CPP=xicl6.exe
 RSC=rc.exe
 
 !IF  "$(CFG)" == "federationC - Win32 Release"
@@ -49,9 +49,9 @@ RSC=rc.exe
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
-LINK32=link.exe
+LINK32=xilink6.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 /nologo /subsystem:console /machine:I386 /out:"publisher.exe" /libpath:"../../../lib"
+# ADD LINK32 /nologo /subsystem:console /machine:I386 /nodefaultlib /out:"publisher.exe" /libpath:"../../../lib"
 # SUBTRACT LINK32 /debug
 
 !ELSEIF  "$(CFG)" == "federationC - Win32 Debug"
@@ -75,9 +75,10 @@ LINK32=link.exe
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
-LINK32=link.exe
+LINK32=xilink6.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
 # ADD LINK32 /nologo /subsystem:console /debug /machine:I386 /out:"publisher.exe" /pdbtype:sept /libpath:"../../../lib"
+# SUBTRACT LINK32 /nodefaultlib
 
 !ENDIF 
 
diff --git a/cpp/test/IceStorm/federation/federationS.dsp b/cpp/test/IceStorm/federation/federationS.dsp
index 402490a166d..2e3463edcb3 100644
--- a/cpp/test/IceStorm/federation/federationS.dsp
+++ b/cpp/test/IceStorm/federation/federationS.dsp
@@ -25,7 +25,7 @@ CFG=federationS - Win32 Debug
 # PROP AllowPerConfigDependencies 0
 # PROP Scc_ProjName ""
 # PROP Scc_LocalPath ""
-CPP=cl.exe
+CPP=xicl6.exe
 RSC=rc.exe
 
 !IF  "$(CFG)" == "federationS - Win32 Release"
@@ -49,9 +49,9 @@ RSC=rc.exe
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
-LINK32=link.exe
+LINK32=xilink6.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 /nologo /subsystem:console /machine:I386 /out:"subscriber.exe" /libpath:"../../../lib"
+# ADD LINK32 /nologo /subsystem:console /machine:I386 /nodefaultlib /out:"subscriber.exe" /libpath:"../../../lib"
 # SUBTRACT LINK32 /debug
 
 !ELSEIF  "$(CFG)" == "federationS - Win32 Debug"
@@ -75,9 +75,10 @@ LINK32=link.exe
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
-LINK32=link.exe
+LINK32=xilink6.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
 # ADD LINK32 /nologo /subsystem:console /debug /machine:I386 /out:"subscriber.exe" /pdbtype:sept /libpath:"../../../lib"
+# SUBTRACT LINK32 /nodefaultlib
 
 !ENDIF 
 
diff --git a/cpp/test/IceStorm/single/singleC.dsp b/cpp/test/IceStorm/single/singleC.dsp
index 12ff813fd6a..9edbdb00170 100644
--- a/cpp/test/IceStorm/single/singleC.dsp
+++ b/cpp/test/IceStorm/single/singleC.dsp
@@ -25,7 +25,7 @@ CFG=singleC - Win32 Debug
 # PROP AllowPerConfigDependencies 0
 # PROP Scc_ProjName ""
 # PROP Scc_LocalPath ""
-CPP=cl.exe
+CPP=xicl6.exe
 RSC=rc.exe
 
 !IF  "$(CFG)" == "singleC - Win32 Release"
@@ -49,9 +49,9 @@ RSC=rc.exe
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
-LINK32=link.exe
+LINK32=xilink6.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 /nologo /subsystem:console /machine:I386 /out:"publisher.exe" /libpath:"../../../lib"
+# ADD LINK32 /nologo /subsystem:console /machine:I386 /nodefaultlib /out:"publisher.exe" /libpath:"../../../lib"
 # SUBTRACT LINK32 /debug
 
 !ELSEIF  "$(CFG)" == "singleC - Win32 Debug"
@@ -75,9 +75,10 @@ LINK32=link.exe
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
-LINK32=link.exe
+LINK32=xilink6.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
 # ADD LINK32 /nologo /subsystem:console /debug /machine:I386 /out:"publisher.exe" /pdbtype:sept /libpath:"../../../lib"
+# SUBTRACT LINK32 /nodefaultlib
 
 !ENDIF 
 
diff --git a/cpp/test/IceStorm/single/singleS.dsp b/cpp/test/IceStorm/single/singleS.dsp
index 4f1a52b0f88..a711655fd99 100644
--- a/cpp/test/IceStorm/single/singleS.dsp
+++ b/cpp/test/IceStorm/single/singleS.dsp
@@ -25,7 +25,7 @@ CFG=singleS - Win32 Debug
 # PROP AllowPerConfigDependencies 0
 # PROP Scc_ProjName ""
 # PROP Scc_LocalPath ""
-CPP=cl.exe
+CPP=xicl6.exe
 RSC=rc.exe
 
 !IF  "$(CFG)" == "singleS - Win32 Release"
@@ -49,9 +49,9 @@ RSC=rc.exe
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
-LINK32=link.exe
+LINK32=xilink6.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 /nologo /subsystem:console /machine:I386 /out:"subscriber.exe" /libpath:"../../../lib"
+# ADD LINK32 /nologo /subsystem:console /machine:I386 /nodefaultlib /out:"subscriber.exe" /libpath:"../../../lib"
 # SUBTRACT LINK32 /debug
 
 !ELSEIF  "$(CFG)" == "singleS - Win32 Debug"
@@ -75,9 +75,10 @@ LINK32=link.exe
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
-LINK32=link.exe
+LINK32=xilink6.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
 # ADD LINK32 /nologo /subsystem:console /debug /machine:I386 /out:"subscriber.exe" /pdbtype:sept /libpath:"../../../lib"
+# SUBTRACT LINK32 /nodefaultlib
 
 !ENDIF 
 
diff --git a/cpp/test/IceUtil/thread/thread.dsp b/cpp/test/IceUtil/thread/thread.dsp
index 06b43e7e401..ebb701a19d4 100644
--- a/cpp/test/IceUtil/thread/thread.dsp
+++ b/cpp/test/IceUtil/thread/thread.dsp
@@ -25,7 +25,7 @@ CFG=thread - Win32 Debug
 # PROP AllowPerConfigDependencies 0
 # PROP Scc_ProjName ""
 # PROP Scc_LocalPath ""
-CPP=cl.exe
+CPP=xicl6.exe
 RSC=rc.exe
 
 !IF  "$(CFG)" == "thread - Win32 Release"
@@ -49,9 +49,9 @@ RSC=rc.exe
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
-LINK32=link.exe
+LINK32=xilink6.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 /nologo /subsystem:console /machine:I386 /out:"client.exe" /libpath:"../../../lib"
+# ADD LINK32 /nologo /subsystem:console /machine:I386 /nodefaultlib /out:"client.exe" /libpath:"../../../lib"
 
 !ELSEIF  "$(CFG)" == "thread - Win32 Debug"
 
@@ -74,9 +74,10 @@ LINK32=link.exe
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
-LINK32=link.exe
+LINK32=xilink6.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
 # ADD LINK32 /nologo /subsystem:console /debug /machine:I386 /out:"client.exe" /pdbtype:sept /libpath:"../../../lib"
+# SUBTRACT LINK32 /nodefaultlib
 
 !ENDIF
author	Marc Laukien <marc@zeroc.com>	2002-01-14 21:31:03 +0000
committer	Marc Laukien <marc@zeroc.com>	2002-01-14 21:31:03 +0000
commit	10a05710b876c4c04072224a62d25a974245d17e (patch)
tree	dcd281feb54d0e72223697e4120ebb69b9a14511
parent	glacier intergration (diff)
download	ice-10a05710b876c4c04072224a62d25a974245d17e.tar.bz2 ice-10a05710b876c4c04072224a62d25a974245d17e.tar.xz ice-10a05710b876c4c04072224a62d25a974245d17e.zip