From 12486fecc4f8d9a3bed37cf3d732b1250b075e24 Mon Sep 17 00:00:00 2001 From: Martin Sustrik Date: Fri, 18 Feb 2011 17:57:59 +0100 Subject: Fix MSVC and SunStudio builds with OpenPGM Signed-off-by: Martin Sustrik --- src/pgm_socket.hpp | 5 +++++ src/zmq.cpp | 6 ++++++ 2 files changed, 11 insertions(+) (limited to 'src') 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 +// 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 + +// 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_) -- cgit v1.2.3