Fix MSVC and SunStudio builds with OpenPGM

Signed-off-by: Martin Sustrik <sustrik@250bpm.com>

Fix MSVC and SunStudio builds with OpenPGM
Signed-off-by: Martin Sustrik <sustrik@250bpm.com>
12486fec · Martin Sustrik · 17e2ca71 · 12486fec · 12486fec
Commit 12486fec authored Feb 18, 2011 by Martin Sustrik
Hide whitespace changes
Inline Side-by-side

Showing with 11 additions and 0 deletions

pgm_socket.hpp src/pgm_socket.hpp +5 -0

zmq.cpp src/zmq.cpp +6 -0

No files found.
--- 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

--- 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_)