summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Sustrik <sustrik@250bpm.com>2011-04-12 09:22:22 +0200
committerMartin Sustrik <sustrik@250bpm.com>2011-04-12 09:22:22 +0200
commite6fd193760952fb7ad9ba787ff210993cf1c2031 (patch)
tree5b2f603692e173081396a2aebfe7decd2e265535
parenta3b49ca958be908b88b17ecc946006dccfbd2a75 (diff)
OpenPGM now doesn't redefine bool, we can drop the workaround
Signed-off-by: Martin Sustrik <sustrik@250bpm.com>
-rw-r--r--src/pgm_socket.hpp5
-rw-r--r--src/zmq.cpp5
2 files changed, 0 insertions, 10 deletions
diff --git a/src/pgm_socket.hpp b/src/pgm_socket.hpp
index 4caba05..fc684b9 100644
--- a/src/pgm_socket.hpp
+++ b/src/pgm_socket.hpp
@@ -32,11 +32,6 @@
#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 0f536ac..525e604 100644
--- a/src/zmq.cpp
+++ b/src/zmq.cpp
@@ -58,11 +58,6 @@
#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_)