diff options
| author | Jose <jose@zeroc.com> | 2012-08-16 21:54:10 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2012-08-16 21:54:10 +0200 |
| commit | 0333544ca90a99baa6e9dc7373eba744d4404970 (patch) | |
| tree | b8d204864002edf7d0bbe903a8bf1fc8c917c8ee /cpp/src/Ice/ThreadPool.cpp | |
| parent | minor fixes (diff) | |
| parent | IceGridGUI updates to use latest jgoodies packages (diff) | |
| download | ice-0333544ca90a99baa6e9dc7373eba744d4404970.tar.bz2 ice-0333544ca90a99baa6e9dc7373eba744d4404970.tar.xz ice-0333544ca90a99baa6e9dc7373eba744d4404970.zip | |
Merge remote-tracking branch 'origin/encoding11' into mx
Conflicts:
cpp/config/Make.rules.Darwin
cpp/src/Ice/ConnectionFactory.cpp
cpp/src/Ice/ConnectionI.h
Diffstat (limited to 'cpp/src/Ice/ThreadPool.cpp')
| -rw-r--r-- | cpp/src/Ice/ThreadPool.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/cpp/src/Ice/ThreadPool.cpp b/cpp/src/Ice/ThreadPool.cpp index 2faf56e1538..d6114a45071 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> |