diff options
| author | Jose <jose@zeroc.com> | 2012-08-14 23:37:47 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2012-08-14 23:37:47 +0200 |
| commit | beca9b9516645a051e1f55dd1902f75d8f97bc9f (patch) | |
| tree | c4224186e3554f743084fbaaab1303e32759ad85 /cpp/src | |
| parent | ICE-4808 - C++ Service don't use UNICODE version of various Windows API methods (diff) | |
| download | ice-beca9b9516645a051e1f55dd1902f75d8f97bc9f.tar.bz2 ice-beca9b9516645a051e1f55dd1902f75d8f97bc9f.tar.xz ice-beca9b9516645a051e1f55dd1902f75d8f97bc9f.zip | |
MinGW minor fixes
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/Ice/Network.cpp | 8 | ||||
| -rw-r--r-- | cpp/src/Ice/ThreadPool.cpp | 8 | ||||
| -rw-r--r-- | cpp/src/IceUtil/OutputUtil.cpp | 4 |
3 files changed, 20 insertions, 0 deletions
diff --git a/cpp/src/Ice/Network.cpp b/cpp/src/Ice/Network.cpp index d3ed3c505ca..9b1094ee0dc 100644 --- a/cpp/src/Ice/Network.cpp +++ b/cpp/src/Ice/Network.cpp @@ -17,6 +17,14 @@ # include <netinet/in.h> #endif +// +// The following is required for MinGW to bring in +// some definitions. +// +#if defined(__MINGW32__) +# define _WIN32_WINNT 0x0501 +#endif + #include <IceUtil/DisableWarnings.h> #include <Ice/Network.h> #include <IceUtil/StringUtil.h> diff --git a/cpp/src/Ice/ThreadPool.cpp b/cpp/src/Ice/ThreadPool.cpp index 8e79614c66e..733adb3df1e 100644 --- a/cpp/src/Ice/ThreadPool.cpp +++ b/cpp/src/Ice/ThreadPool.cpp @@ -7,6 +7,14 @@ // // ********************************************************************** +// +// The following is required for MinGW to bring in +// some definitions. +// +#if defined(__MINGW32__) +# define _WIN32_WINNT 0x0501 +#endif + #include <Ice/ThreadPool.h> #include <IceUtil/DisableWarnings.h> #include <Ice/EventHandler.h> diff --git a/cpp/src/IceUtil/OutputUtil.cpp b/cpp/src/IceUtil/OutputUtil.cpp index 00464533d98..7ab7ca159f0 100644 --- a/cpp/src/IceUtil/OutputUtil.cpp +++ b/cpp/src/IceUtil/OutputUtil.cpp @@ -35,7 +35,11 @@ IceUtilInternal::int64ToString(Int64 val) { char buf[64]; #ifdef _WIN32 +# if defined(_MSC_VER) sprintf_s(buf, sizeof(buf), "%I64d", val); +# else + sprintf(buf, "%I64d", val); +# endif #elif defined(ICE_64) sprintf(buf, "%ld", val); // Avoids a format warning from GCC. #else |