diff options
| author | Martin Sustrik <sustrik@250bpm.com> | 2011-02-18 17:57:59 +0100 |
|---|---|---|
| committer | Martin Sustrik <sustrik@250bpm.com> | 2011-02-18 17:57:59 +0100 |
| commit | 12486fecc4f8d9a3bed37cf3d732b1250b075e24 (patch) | |
| tree | 13b428287dccfbf7c306d0affcd11a55c3395610 /src | |
| parent | 17e2ca71b4f6db76a4848d366defa36f1b19bdd7 (diff) | |
Fix MSVC and SunStudio builds with OpenPGM
Signed-off-by: Martin Sustrik <sustrik@250bpm.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/pgm_socket.hpp | 5 | ||||
| -rw-r--r-- | src/zmq.cpp | 6 |
2 files changed, 11 insertions, 0 deletions
diff --git a/src/pgm_socket.hpp b/src/pgm_socket.hpp index c8b6ac5..e6216de 100644 --- a/src/pgm_socket.hpp +++ b/src/pgm_socket.hpp @@ -31,6 +31,11 @@ #define __PGM_WININT_H__ #include <pgm/pgm.h> +// TODO: OpenPGM redefines bool -- remove this once OpenPGM is fixed. +#if defined bool +#undef bool +#endif + #include "options.hpp" namespace zmq diff --git a/src/zmq.cpp b/src/zmq.cpp index 1d17b15..037f6c2 100644 --- a/src/zmq.cpp +++ b/src/zmq.cpp @@ -57,6 +57,12 @@ #if defined ZMQ_HAVE_OPENPGM #define __PGM_WININT_H__ #include <pgm/pgm.h> + +// TODO: OpenPGM redefines bool -- remove this once OpenPGM is fixed. +#if defined bool +#undef bool +#endif + #endif void zmq_version (int *major_, int *minor_, int *patch_) |