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/FreezeScript/transformdb.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/FreezeScript/transformdb.cpp')
| -rwxr-xr-x | cpp/src/FreezeScript/transformdb.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/cpp/src/FreezeScript/transformdb.cpp b/cpp/src/FreezeScript/transformdb.cpp index 7d8573fe09d..6a6bd5fe7f5 100755 --- a/cpp/src/FreezeScript/transformdb.cpp +++ b/cpp/src/FreezeScript/transformdb.cpp @@ -928,8 +928,7 @@ run(const Ice::StringSeq& originalArgs, const Ice::CommunicatorPtr& communicator return status; } -//COMPILERFIX: Borland C++ 2010 doesn't support wmain for console applications. -#if defined(_WIN32 ) && !defined(__BCPLUSPLUS__) +#ifdef _WIN32 int wmain(int argc, wchar_t* argv[]) |