From 7afc61ae7c4859fa1a6273e1964d378c00142746 Mon Sep 17 00:00:00 2001
From: malosek <malosek@fastmq.com>
Date: Tue, 6 Oct 2009 12:57:24 +0200
Subject: 0MQ compilable on winXP mingw with --with-pgm2 option

---
 src/pgm_socket.cpp | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

(limited to 'src/pgm_socket.cpp')

diff --git a/src/pgm_socket.cpp b/src/pgm_socket.cpp
index b4f79e6..da8da3b 100644
--- a/src/pgm_socket.cpp
+++ b/src/pgm_socket.cpp
@@ -21,13 +21,17 @@
 
 #ifdef ZMQ_HAVE_OPENPGM
 
+#ifdef ZMQ_HAVE_WINDOWS
+#include "windows.hpp"
+#endif
+
 #ifdef ZMQ_HAVE_LINUX
-//  TODO: needed for pgm - add this into platform.hpp?
+#include <poll.h>
+//  Has to be defined befiore including pgm/pgm.h
 #define CONFIG_HAVE_POLL
-
-#include <pgm/pgm.h>
 #endif
 
+#include <pgm/pgm.h>
 #include <string>
 #include <iostream>
 
@@ -51,8 +55,6 @@
         { printf (__VA_ARGS__);}} while (0)
 #endif
 
-#ifdef ZMQ_HAVE_LINUX
-
 zmq::pgm_socket_t::pgm_socket_t (bool receiver_, const options_t &options_) :
     g_transport (NULL),
     options (options_),
@@ -480,7 +482,9 @@ void zmq::pgm_socket_t::close_transport (void)
 int zmq::pgm_socket_t::get_receiver_fds (int *recv_fd_, 
     int *waiting_pipe_fd_)
 {
-
+#ifdef ZMQ_HAVE_WINDOWS
+    zmq_assert (false);
+#else
     //  For POLLIN there are 2 pollfds in pgm_transport.
     int fds_array_size = pgm_receiver_fd_count;
     pollfd *fds = new pollfd [fds_array_size];
@@ -500,7 +504,7 @@ int zmq::pgm_socket_t::get_receiver_fds (int *recv_fd_,
     *waiting_pipe_fd_ = fds [1].fd;
 
     delete [] fds;
-
+#endif
     return pgm_receiver_fd_count;
 }
 
@@ -520,6 +524,9 @@ int zmq::pgm_socket_t::get_sender_fds (int *send_fd_, int *receive_fd_,
     zmq_assert (rdata_notify_fd_);
 #endif
 
+#ifdef ZMQ_HAVE_WINDOWS
+    zmq_assert (false);
+#else
     //  Preallocate pollfds array.
     int fds_array_size = pgm_sender_fd_count;
     pollfd *fds = new pollfd [fds_array_size];
@@ -546,6 +553,7 @@ int zmq::pgm_socket_t::get_sender_fds (int *send_fd_, int *receive_fd_,
 #endif
 
     delete [] fds;
+#endif
 
     return pgm_sender_fd_count;
 }
@@ -855,4 +863,3 @@ void zmq::pgm_socket_t::process_upstream (void)
 
 #endif
 
-#endif
-- 
cgit v1.2.3