diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2012-08-06 16:14:03 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2012-08-06 16:14:03 +0200 |
| commit | 7047b953adab26c7098cbfaea2b69f9d36231cd3 (patch) | |
| tree | 8668c830838184ebc465554b85c085da42fb6f6a /cpp/src/IcePatch2/Server.cpp | |
| parent | Missing files (diff) | |
| parent | Removed Stream::format method, replace with startWriteEncaps parameter (diff) | |
| download | ice-7047b953adab26c7098cbfaea2b69f9d36231cd3.tar.bz2 ice-7047b953adab26c7098cbfaea2b69f9d36231cd3.tar.xz ice-7047b953adab26c7098cbfaea2b69f9d36231cd3.zip | |
Merge remote-tracking branch 'origin/encoding11' into mx
Conflicts:
cpp/src/Ice/.depend
cpp/src/Ice/.depend.mak
cpp/src/slice2cpp/Gen.cpp
Diffstat (limited to 'cpp/src/IcePatch2/Server.cpp')
| -rw-r--r-- | cpp/src/IcePatch2/Server.cpp | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/cpp/src/IcePatch2/Server.cpp b/cpp/src/IcePatch2/Server.cpp index b7a871719fd..7bdc7376629 100644 --- a/cpp/src/IcePatch2/Server.cpp +++ b/cpp/src/IcePatch2/Server.cpp @@ -213,18 +213,8 @@ IcePatch2::PatcherService::usage(const string& appName) #ifdef _WIN32 -//COMPILERFIX: Borland C++ 2010 doesn't support wmain for console applications. -#ifdef __BCCPLUSPLUS__ - -int -main(int argc, char* argv[]) - -#else - int wmain(int argc, wchar_t* argv[]) - -#endif { IcePatch2::PatcherService svc; int status = EXIT_FAILURE; |