Changes for bug 3962 and 4714

1 files changed, 11 insertions, 1 deletions

diff --git a/cpp/src/IcePatch2/Client.cpp b/cpp/src/IcePatch2/Client.cpp
index 29cd1516563..3c5b21a5bad 100644
--- a/cpp/src/IcePatch2/Client.cpp
+++ b/cpp/src/IcePatch2/Client.cpp
@@ -333,9 +333,19 @@ Client::usage(const string& appName)
     cerr << options << endl;
 }
 
+#ifdef _WIN32
+
+int
+wmain(int argc, wchar_t* argv[])
+
+#else
+
 int
 main(int argc, char* argv[])
+
+#endif
 {
     Client app;
-    return app.main(argc, argv);
+    int rc = app.main(argc, argv);
+    return rc;
 }