pgm2 receiver working (partly)

src/Makefile.am

@@ -260,7 +260,8 @@ libzmq_la_CFLAGS = -I$(top_srcdir)/foreign/openpgm/@pgm_basename@/openpgm/pgm/in
     -DCONFIG_HAVE_GETPROTOBYNAME_R \
     -DCONFIG_BIND_INADDR_ANY \
     -DCONFIG_GALOIS_MUL_LUT \
-    -DGETTEXT_PACKAGE=\'"pgm"\'
+    -DGETTEXT_PACKAGE='"pgm"' \
+    -DG_LOG_DOMAIN='"Pgm"'
 endif
 
 if BUILD_NO_PGM

src/pgm_socket.hpp

@@ -119,16 +119,28 @@ namespace zmq
         pgm_msgv_t *pgm_msgv;
 
         // How many bytes were read from pgm socket.
+#ifdef ZMQ_HAVE_OPENPGM1
         ssize_t nbytes_rec;
+#elif defined ZMQ_HAVE_OPENPGM2
+        size_t nbytes_rec;
+#endif
 
         //  How many bytes were processed from last pgm socket read.
+#ifdef ZMQ_HAVE_OPENPGM1
         ssize_t nbytes_processed;
+#elif defined ZMQ_HAVE_OPENPGM2
+        size_t nbytes_processed;
+#endif
         
         //  How many messages from pgm_msgv were already sent up.
+#ifdef ZMQ_HAVE_OPENPGM1
         ssize_t pgm_msgv_processed;
+#elif defined ZMQ_HAVE_OPENPGM2
+        size_t pgm_msgv_processed;
+#endif
 
         //  Size of pgm_msgv array.
-        ssize_t pgm_msgv_len;
+        size_t pgm_msgv_len;
 
         //  Sender transport uses 2 fd.
         enum {pgm_sender_fd_count = 2};

src/socket_base.cpp

@@ -93,7 +93,7 @@ int zmq::socket_base_t::bind (const char *addr_)
         return 0;
     }
 
-#if defined ZMQ_HAVE_OPENPGM1
+#if defined ZMQ_HAVE_OPENPGM
     if (addr_type == "pgm" || addr_type == "udp") {
         //  In the case of PGM bind behaves the same like connect.
         return connect (addr_); 
@@ -179,7 +179,7 @@ int zmq::socket_base_t::connect (const char *addr_)
         return 0;
     }
 
-#if defined ZMQ_HAVE_OPENPGM1
+#if defined ZMQ_HAVE_OPENPGM
     if (addr_type == "pgm" || addr_type == "udp") {
 
         //  If the socket type requires bi-directional communication