Skip to content

Commit 463a1d5

Browse files
committed
Refresh ZeroMQ 4.3.1 patch
Some patch implementations can't handle fuzz / too much divergence from the original code. This just tweaks the context code around the patch so that less-sophisticated patch implementations (such as on Alpine Linux) can apply the patch without errors.
1 parent f8b0b19 commit 463a1d5

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

depends/patches/zeromq/0002-disable-pthread_set_name_np.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ diff --git a/src/thread.cpp b/src/thread.cpp
1212
index a1086b0c..9943f354 100644
1313
--- a/src/thread.cpp
1414
+++ b/src/thread.cpp
15-
@@ -307,7 +307,7 @@ void zmq::thread_t::setThreadName (const char *name_)
15+
@@ -308,7 +308,7 @@ void zmq::thread_t::setThreadName (const char *name_)
1616
*/
1717
if (!name_)
1818
return;
@@ -21,9 +21,9 @@ index a1086b0c..9943f354 100644
2121
#if defined(ZMQ_HAVE_PTHREAD_SETNAME_1)
2222
int rc = pthread_setname_np (name_);
2323
if (rc)
24-
@@ -323,6 +323,8 @@ void zmq::thread_t::setThreadName (const char *name_)
24+
@@ -324,6 +324,8 @@ void zmq::thread_t::setThreadName (const char *name_)
2525
#elif defined(ZMQ_HAVE_PTHREAD_SET_NAME)
26-
pthread_set_name_np (descriptor, name_);
26+
pthread_set_name_np (_descriptor, name_);
2727
#endif
2828
+#endif
2929
+ return;

0 commit comments

Comments
 (0)