3 files changed, 16 insertions, 1 deletions
diff --git a/cpp/slice/Ice/Current.ice b/cpp/slice/Ice/Current.ice
index 5eddc4ce386..d75091dd052 100644
--- a/cpp/slice/Ice/Current.ice
+++ b/cpp/slice/Ice/Current.ice
@@ -33,7 +33,7 @@ local dictionary<string, string> Context;
  * signature (for C++), as well as the retry
  * behavior of the Ice run time for an operation
  * invocation in case of a (potentially) recoverable
- * error..
+ * error.
  *
  **/
 //
diff --git a/cpp/src/IcePatch/Client.cpp b/cpp/src/IcePatch/Client.cpp
index 1fe50d674e3..bbf34ee8743 100644
--- a/cpp/src/IcePatch/Client.cpp
+++ b/cpp/src/IcePatch/Client.cpp
@@ -221,8 +221,13 @@ IcePatch::Client::run(int argc, char* argv[])
 	_remove = properties->getPropertyAsInt("IcePatch.RemoveOrphaned") > 0;
 	if(_remove)
 	{
+#ifdef _WIN32
+	    char cwd[_MAX_PATH];
+	    _getcwd(cwd, _MAX_PATH);
+#else
 	    char cwd[PATH_MAX];
 	    getcwd(cwd, PATH_MAX);
+#endif
 	    cout << "WARNING: All orphaned files in `" << cwd << "' will be removed." << endl;
 	    cout << "Do you want to proceed? (yes/no)" << endl;
 	    string answer;
diff --git a/cpp/src/IcePatch/icepatch.dsp b/cpp/src/IcePatch/icepatch.dsp
index 550c33d9aee..566a59ddb1e 100644
--- a/cpp/src/IcePatch/icepatch.dsp
+++ b/cpp/src/IcePatch/icepatch.dsp
@@ -57,6 +57,7 @@ LINK32=link.exe
 # ADD LINK32 libeay32.lib ssleay32.lib libbz2.lib /nologo /dll /machine:I386 /out:"Release/icepatch001.dll" /libpath:"../../../lib"
 # SUBTRACT LINK32 /pdb:none /debug /nodefaultlib
 # Begin Special Build Tool
+OutDir=.\Release
 SOURCE="$(InputPath)"
 PostBuild_Cmds=copy $(OutDir)\icepatch001.* ..\..\lib
 # End Special Build Tool
@@ -89,6 +90,7 @@ LINK32=link.exe
 # ADD LINK32 libeay32.lib ssleay32.lib libbz2d.lib /nologo /dll /debug /machine:I386 /out:"Debug/icepatch001d.dll" /pdbtype:sept /libpath:"../../../lib"
 # SUBTRACT LINK32 /pdb:none /nodefaultlib
 # Begin Special Build Tool
+OutDir=.\Debug
 SOURCE="$(InputPath)"
 PostBuild_Cmds=copy $(OutDir)\icepatch001d.* ..\..\lib
 # End Special Build Tool
@@ -104,6 +106,10 @@ PostBuild_Cmds=copy $(OutDir)\icepatch001d.* ..\..\lib
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
 # Begin Source File
 
+SOURCE=.\ClientUtil.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\FileDescFactory.cpp
 # End Source File
 # Begin Source File
@@ -120,6 +126,10 @@ SOURCE=.\Util.cpp
 # PROP Default_Filter "h;hpp;hxx;hm;inl"
 # Begin Source File
 
+SOURCE=..\..\include\IcePatch\ClientUtil.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\IcePatch\FileDescFactory.h
 # End Source File
 # Begin Source File