Mercurial > mxe-octave

annotate src/mingw-zeromq-1-fixes.patch @ 6001:88762923aa9a release

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
octave-launch: Attach to console of parent process if applicable. * installer-files/octave-launch.c: If parent process has a console, attach to it.
author Markus Mützel <markus.muetzel@gmx.de>
date Sun, 05 Dec 2021 18:26:51 +0100
parents 3c303f9b5a36
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
5638
3c303f9b5a36 zeromq: update to v4.3.3
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
1 --- a/tests/testutil.cpp
3c303f9b5a36 zeromq: update to v4.3.3
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
2 +++ b/tests/testutil.cpp
3c303f9b5a36 zeromq: update to v4.3.3
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
3 @@ -382,7 +382,7 @@ fd_t connect_socket (const char *endpoint_, const int af_, const int protocol_)
3c303f9b5a36 zeromq: update to v4.3.3
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
4 protocol_ == IPPROTO_UDP
3c303f9b5a36 zeromq: update to v4.3.3
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
5 ? IPPROTO_UDP
3c303f9b5a36 zeromq: update to v4.3.3
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
6 : protocol_ == IPPROTO_TCP ? IPPROTO_TCP : 0);
3c303f9b5a36 zeromq: update to v4.3.3
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
7 - TEST_ASSERT_NOT_EQUAL (-1, s_pre);
3c303f9b5a36 zeromq: update to v4.3.3
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
8 + TEST_ASSERT_NOT_EQUAL (retired_fd, s_pre);
3c303f9b5a36 zeromq: update to v4.3.3
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
9
3c303f9b5a36 zeromq: update to v4.3.3
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
10 if (af_ == AF_INET || af_ == AF_INET6) {
3c303f9b5a36 zeromq: update to v4.3.3
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
11 const char *port = strrchr (endpoint_, ':') + 1;
3c303f9b5a36 zeromq: update to v4.3.3
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
12 @@ -439,7 +439,7 @@ fd_t bind_socket_resolve_port (const char *address_,
3c303f9b5a36 zeromq: update to v4.3.3
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
13 protocol_ == IPPROTO_UDP
3c303f9b5a36 zeromq: update to v4.3.3
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
14 ? IPPROTO_UDP
3c303f9b5a36 zeromq: update to v4.3.3
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
15 : protocol_ == IPPROTO_TCP ? IPPROTO_TCP : 0);
3c303f9b5a36 zeromq: update to v4.3.3
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
16 - TEST_ASSERT_NOT_EQUAL (-1, s_pre);
3c303f9b5a36 zeromq: update to v4.3.3
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
17 + TEST_ASSERT_NOT_EQUAL (retired_fd, s_pre);
3c303f9b5a36 zeromq: update to v4.3.3
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
18
3c303f9b5a36 zeromq: update to v4.3.3
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
19 if (af_ == AF_INET || af_ == AF_INET6) {
3c303f9b5a36 zeromq: update to v4.3.3
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
20 #ifdef ZMQ_HAVE_WINDOWS
3c303f9b5a36 zeromq: update to v4.3.3
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
21
3c303f9b5a36 zeromq: update to v4.3.3
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
22 --- a/tests/testutil.hpp
3c303f9b5a36 zeromq: update to v4.3.3
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
23 +++ b/tests/testutil.hpp
3c303f9b5a36 zeromq: update to v4.3.3
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
24 @@ -102,7 +102,6 @@ const uint8_t zmtp_ready_sub[27] = {
3c303f9b5a36 zeromq: update to v4.3.3
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
25 #include <winsock2.h>
3c303f9b5a36 zeromq: update to v4.3.3
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
26 #include <ws2tcpip.h>
3c303f9b5a36 zeromq: update to v4.3.3
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
27 #include <stdexcept>
3c303f9b5a36 zeromq: update to v4.3.3
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
28 -#define close closesocket
3c303f9b5a36 zeromq: update to v4.3.3
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
29 typedef int socket_size_t;
3c303f9b5a36 zeromq: update to v4.3.3
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
30 inline const char *as_setsockopt_opt_t (const void *opt)
3c303f9b5a36 zeromq: update to v4.3.3
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
31 {
3c303f9b5a36 zeromq: update to v4.3.3
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
32
3c303f9b5a36 zeromq: update to v4.3.3
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
33 --- a/tests/testutil.cpp
3c303f9b5a36 zeromq: update to v4.3.3
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
34 +++ b/tests/testutil.cpp
3c303f9b5a36 zeromq: update to v4.3.3
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
35 @@ -296,7 +296,7 @@ int is_ipv6_available ()
3c303f9b5a36 zeromq: update to v4.3.3
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
36 ipv6 = 0;
3c303f9b5a36 zeromq: update to v4.3.3
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
37 }
3c303f9b5a36 zeromq: update to v4.3.3
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
38 #endif
3c303f9b5a36 zeromq: update to v4.3.3
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
39 - close (fd);
3c303f9b5a36 zeromq: update to v4.3.3
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
40 + closesocket (fd);
3c303f9b5a36 zeromq: update to v4.3.3
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
41 }
3c303f9b5a36 zeromq: update to v4.3.3
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
42
3c303f9b5a36 zeromq: update to v4.3.3
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
43 return ipv6;
3c303f9b5a36 zeromq: update to v4.3.3
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
44 @@ -484,7 +484,7 @@ fd_t bind_socket_resolve_port (const char *address_,
3c303f9b5a36 zeromq: update to v4.3.3
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
45 #else
3c303f9b5a36 zeromq: update to v4.3.3
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
46 int fd = mkstemp (buffer);
3c303f9b5a36 zeromq: update to v4.3.3
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
47 TEST_ASSERT_TRUE (fd != -1);
3c303f9b5a36 zeromq: update to v4.3.3
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
48 - close (fd);
3c303f9b5a36 zeromq: update to v4.3.3
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
49 + closesocket (fd);
3c303f9b5a36 zeromq: update to v4.3.3
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
50 #endif
3c303f9b5a36 zeromq: update to v4.3.3
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
51 #endif
3c303f9b5a36 zeromq: update to v4.3.3
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
52 strcpy ((*(struct sockaddr_un *) &addr).sun_path, buffer);
3c303f9b5a36 zeromq: update to v4.3.3
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
53 diff -ur zeromq-4.3.3.orig/Makefile.in zeromq-4.3.3/Makefile.in
3c303f9b5a36 zeromq: update to v4.3.3
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
54 --- zeromq-4.3.3.orig/Makefile.in 2021-01-16 16:58:57.118548621 -0500
3c303f9b5a36 zeromq: update to v4.3.3
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
55 +++ zeromq-4.3.3/Makefile.in 2021-01-16 17:07:39.885588121 -0500
3c303f9b5a36 zeromq: update to v4.3.3
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
56 @@ -2881,7 +2881,7 @@
3c303f9b5a36 zeromq: update to v4.3.3
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
57 $(am__append_29) $(am__append_30) $(am__append_31) \
3c303f9b5a36 zeromq: update to v4.3.3
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
58 $(am__append_32) $(am__append_33) $(am__append_36) \
3c303f9b5a36 zeromq: update to v4.3.3
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
59 $(am__append_37) $(am__append_38) $(am__append_39)
3c303f9b5a36 zeromq: update to v4.3.3
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
60 -UNITY_CPPFLAGS = -I$(top_srcdir)/external/unity -DUNITY_USE_COMMAND_LINE_ARGS -DUNITY_EXCLUDE_FLOAT
3c303f9b5a36 zeromq: update to v4.3.3
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
61 +UNITY_CPPFLAGS = -I$(top_srcdir)/external/unity -DUNITY_USE_COMMAND_LINE_ARGS -DUNITY_EXCLUDE_FLOAT -D__USE_MINGW_ANSI_STDIO=1
3c303f9b5a36 zeromq: update to v4.3.3
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
62 UNITY_LIBS = $(top_builddir)/external/unity/libunity.a
3c303f9b5a36 zeromq: update to v4.3.3
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
63 external_unity_libunity_a_SOURCES = external/unity/unity.c \
3c303f9b5a36 zeromq: update to v4.3.3
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
64 external/unity/unity.h \