Mercurial > mxe-octave

comparison src/mingw-zeromq-1-fixes.patch @ 5638:3c303f9b5a36

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
zeromq: update to v4.3.3 * src/zeromq.mk: update version/checksum * src/mingw-zeromq-1-fixes.patch: new file * dist-files: add ref to patch file
author John Donoghue <john.donoghue@ieee.org>
date Sun, 17 Jan 2021 08:00:16 -0500
parents
children
comparison
equal deleted inserted replaced
5637:046929464015 5638:3c303f9b5a36
1 --- a/tests/testutil.cpp
2 +++ b/tests/testutil.cpp
3 @@ -382,7 +382,7 @@ fd_t connect_socket (const char *endpoint_, const int af_, const int protocol_)
4 protocol_ == IPPROTO_UDP
5 ? IPPROTO_UDP
6 : protocol_ == IPPROTO_TCP ? IPPROTO_TCP : 0);
7 - TEST_ASSERT_NOT_EQUAL (-1, s_pre);
8 + TEST_ASSERT_NOT_EQUAL (retired_fd, s_pre);
9
10 if (af_ == AF_INET || af_ == AF_INET6) {
11 const char *port = strrchr (endpoint_, ':') + 1;
12 @@ -439,7 +439,7 @@ fd_t bind_socket_resolve_port (const char *address_,
13 protocol_ == IPPROTO_UDP
14 ? IPPROTO_UDP
15 : protocol_ == IPPROTO_TCP ? IPPROTO_TCP : 0);
16 - TEST_ASSERT_NOT_EQUAL (-1, s_pre);
17 + TEST_ASSERT_NOT_EQUAL (retired_fd, s_pre);
18
19 if (af_ == AF_INET || af_ == AF_INET6) {
20 #ifdef ZMQ_HAVE_WINDOWS
21
22 --- a/tests/testutil.hpp
23 +++ b/tests/testutil.hpp
24 @@ -102,7 +102,6 @@ const uint8_t zmtp_ready_sub[27] = {
25 #include <winsock2.h>
26 #include <ws2tcpip.h>
27 #include <stdexcept>
28 -#define close closesocket
29 typedef int socket_size_t;
30 inline const char *as_setsockopt_opt_t (const void *opt)
31 {
32
33 --- a/tests/testutil.cpp
34 +++ b/tests/testutil.cpp
35 @@ -296,7 +296,7 @@ int is_ipv6_available ()
36 ipv6 = 0;
37 }
38 #endif
39 - close (fd);
40 + closesocket (fd);
41 }
42
43 return ipv6;
44 @@ -484,7 +484,7 @@ fd_t bind_socket_resolve_port (const char *address_,
45 #else
46 int fd = mkstemp (buffer);
47 TEST_ASSERT_TRUE (fd != -1);
48 - close (fd);
49 + closesocket (fd);
50 #endif
51 #endif
52 strcpy ((*(struct sockaddr_un *) &addr).sun_path, buffer);
53 diff -ur zeromq-4.3.3.orig/Makefile.in zeromq-4.3.3/Makefile.in
54 --- zeromq-4.3.3.orig/Makefile.in 2021-01-16 16:58:57.118548621 -0500
55 +++ zeromq-4.3.3/Makefile.in 2021-01-16 17:07:39.885588121 -0500
56 @@ -2881,7 +2881,7 @@
57 $(am__append_29) $(am__append_30) $(am__append_31) \
58 $(am__append_32) $(am__append_33) $(am__append_36) \
59 $(am__append_37) $(am__append_38) $(am__append_39)
60 -UNITY_CPPFLAGS = -I$(top_srcdir)/external/unity -DUNITY_USE_COMMAND_LINE_ARGS -DUNITY_EXCLUDE_FLOAT
61 +UNITY_CPPFLAGS = -I$(top_srcdir)/external/unity -DUNITY_USE_COMMAND_LINE_ARGS -DUNITY_EXCLUDE_FLOAT -D__USE_MINGW_ANSI_STDIO=1
62 UNITY_LIBS = $(top_builddir)/external/unity/libunity.a
63 external_unity_libunity_a_SOURCES = external/unity/unity.c \
64 external/unity/unity.h \