Revert "Changes for bug 3962 and 4714"

This reverts commit d38ad95e45c0083d602a43e6d77e6c1599f324fe.

1 files changed, 5 insertions, 13 deletions

diff --git a/cpp/src/IcePatch2/Server.cpp b/cpp/src/IcePatch2/Server.cpp
index 75d28cef865..91e71d708aa 100644
--- a/cpp/src/IcePatch2/Server.cpp
+++ b/cpp/src/IcePatch2/Server.cpp
@@ -213,24 +213,15 @@ IcePatch2::PatcherService::usage(const string& appName)
     print("Usage: " + appName + " [options] [DIR]\n" + options);
 }
 
-#ifdef _WIN32
-
 int
-wmain(int argc, wchar_t* argv[])
+main(int argc, char* argv[])
 {
     IcePatch2::PatcherService svc;
     int status = EXIT_FAILURE;
-    status = svc.main(argc, argv);
-    return status;
-}
 
+#ifdef _WIN32
+    status = svc.main(argc, argv);
 #else
-
-int
-main(int argc, char* argv[])
-{
-    IcePatch2::PatcherService svc;
-    int status = EXIT_FAILURE;
     //
     // For UNIX, force --nochdir option, so the service isn't started
     // with / as the working directory. That way, if the data
@@ -245,6 +236,7 @@ main(int argc, char* argv[])
         args.push_back(argv[i]);
     }
     status = svc.main(args);
+#endif
+
     return status;
 }
-#endif