fix

2 files changed, 3 insertions, 1 deletions

diff --git a/cpp/src/Ice/Instance.cpp b/cpp/src/Ice/Instance.cpp
index 621ab8a889a..92b97b5ab33 100644
--- a/cpp/src/Ice/Instance.cpp
+++ b/cpp/src/Ice/Instance.cpp
@@ -307,6 +307,7 @@ IceInternal::Instance::Instance(const CommunicatorPtr& communicator, const Prope
         _sslSystem = IceSSL::Factory::getSystem(this);
         _sslSystem->configure();
 
+#ifndef _WIN32
 	//
 	// daemon() must be called after the SSL system has been
 	// configured, since SSL might want to read a passphrase from
@@ -324,6 +325,7 @@ IceInternal::Instance::Instance(const CommunicatorPtr& communicator, const Prope
 		throw ex;
 	    }
 	}
+#endif
 
 	//
 	// Must be done after daemon() is called, since daemon()
diff --git a/cpp/src/IcePatch/Client.cpp b/cpp/src/IcePatch/Client.cpp
index ccae39ef90d..b956aa2430b 100644
--- a/cpp/src/IcePatch/Client.cpp
+++ b/cpp/src/IcePatch/Client.cpp
@@ -9,7 +9,6 @@
 // **********************************************************************
 
 #include <Ice/Application.h>
-#include <Glacier/Glacier.h>
 #include <IcePatch/FileDescFactory.h>
 #include <IcePatch/Util.h>
 #include <Glacier/Glacier.h>
@@ -406,6 +405,7 @@ int
 main(int argc, char* argv[])
 {
     addArgumentPrefix("IcePatch");
+    addArgumentPrefix("Glacier");
     Client app;
     return app.main(argc, argv);
 }