From 3dc89feafcee31ef5169d827015f1fe2a18da08b Mon Sep 17 00:00:00 2001 From: KIU Shueng Chuan Date: Thu, 5 Dec 2013 07:04:21 +0800 Subject: [PATCH 1/2] use enum retired_fd instead of -1 using -1 causes a warning on Windows platform because SOCKET is unsigned. --- src/socket_base.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/socket_base.cpp b/src/socket_base.cpp index 935c0099..a1b1ec0a 100644 --- a/src/socket_base.cpp +++ b/src/socket_base.cpp @@ -119,7 +119,7 @@ zmq::socket_base_t *zmq::socket_base_t::create (int type_, class ctx_t *parent_, errno = EINVAL; return NULL; } - if (s->mailbox.get_fd () == -1) + if (s->mailbox.get_fd () == retired_fd) return NULL; alloc_assert (s); From 0552d9119bada6a132a612e8284eb82a58ba26b0 Mon Sep 17 00:00:00 2001 From: Pieter Hintjens Date: Thu, 5 Dec 2013 16:52:36 +0100 Subject: [PATCH 2/2] Updated news for #775 --- NEWS | 2 ++ 1 file changed, 2 insertions(+) diff --git a/NEWS b/NEWS index 521142fc..ddb670a8 100644 --- a/NEWS +++ b/NEWS @@ -4,6 +4,8 @@ Bug Fixes --------- +* Fixed #775; compile error on Windows. + * Fixed #763; when talking to a ZMTP v1 peer (libzmq 2.2), a socket would send an extra identity frame at the start of the connection.