>From e6fd193760952fb7ad9ba787ff210993cf1c2031 Mon Sep 17 00:00:00 2001
From: Martin Sustrik <[email protected]>
Date: Tue, 12 Apr 2011 09:22:22 +0200
Subject: [PATCH] OpenPGM now doesn't redefine bool, we can drop the workaround

Signed-off-by: Martin Sustrik <[email protected]>
---
 src/pgm_socket.hpp |    5 -----
 src/zmq.cpp        |    5 -----
 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_)
-- 
1.7.0.4

_______________________________________________
zeromq-dev mailing list
[email protected]
http://lists.zeromq.org/mailman/listinfo/zeromq-dev

Reply via email to