Revert "Changes for bug 3962 and 4714"

This reverts commit d38ad95e45c0083d602a43e6d77e6c1599f324fe.

1 files changed, 3 insertions, 10 deletions

diff --git a/cpp/src/IceBox/Admin.cpp b/cpp/src/IceBox/Admin.cpp
index f863277c75e..6cd3076b995 100644
--- a/cpp/src/IceBox/Admin.cpp
+++ b/cpp/src/IceBox/Admin.cpp
@@ -23,20 +23,13 @@ public:
     virtual int run(int, char*[]);
 };
 
-#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;
 }
 
 void