Fixed errors when building against zeromq 4.x, #101

zeromq · Sep 26, 2013 · 39e744e · 39e744e
1 parent 9d5d84d
commit 39e744e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/php_zmq_private.h b/php_zmq_private.h
@@ -221,7 +221,7 @@ typedef struct _php_zmq_device_object  {
 #	define zmq_sendmsg zmq_send
 #	define zmq_recvmsg zmq_recv
 #	define PHP_ZMQ_TIMEOUT 1000
-#elif ZMQ_VERSION_MAJOR == 3
+#else
 #	define PHP_ZMQ_TIMEOUT 1
 #endif
 

diff --git a/zmq_device.c b/zmq_device.c
@@ -211,7 +211,7 @@ int php_zmq_device(php_zmq_device_object *intern TSRMLS_DC)
                     return -1;
                 }
 
-#if ZMQ_VERSION_MAJOR >= 3 && ZMQ_VERSION_MINOR == 0
+#if ZMQ_VERSION_MAJOR == 3 && ZMQ_VERSION_MINOR == 0
                 labelsz = sizeof(label);
                 rc = zmq_getsockopt(items [1].socket, ZMQ_RCVLABEL, &label, &labelsz);
                 if(rc < 0) {