aboutsummaryrefslogtreecommitdiff
path: root/depends/patches/zeromq/0002-disable-pthread_set_name_np.patch
diff options
context:
space:
mode:
authorNathan Marley <nathan.marley@gmail.com>2019-09-20 10:01:36 -0300
committerNathan Marley <nathan.marley@gmail.com>2019-09-20 14:44:38 -0300
commit463a1d5244337915de36db36de573eb8782bc430 (patch)
tree6a12105c232d806c48fa03535584632de296d24e /depends/patches/zeromq/0002-disable-pthread_set_name_np.patch
parentf8b0b190aa9d13e93ebfe34b5655dbe8ed8df3d3 (diff)
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.
Diffstat (limited to 'depends/patches/zeromq/0002-disable-pthread_set_name_np.patch')
-rw-r--r--depends/patches/zeromq/0002-disable-pthread_set_name_np.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/depends/patches/zeromq/0002-disable-pthread_set_name_np.patch b/depends/patches/zeromq/0002-disable-pthread_set_name_np.patch
index 022e311977..b1c6f78a70 100644
--- a/depends/patches/zeromq/0002-disable-pthread_set_name_np.patch
+++ b/depends/patches/zeromq/0002-disable-pthread_set_name_np.patch
@@ -12,7 +12,7 @@ diff --git a/src/thread.cpp b/src/thread.cpp
index a1086b0c..9943f354 100644
--- a/src/thread.cpp
+++ b/src/thread.cpp
-@@ -307,7 +307,7 @@ void zmq::thread_t::setThreadName (const char *name_)
+@@ -308,7 +308,7 @@ void zmq::thread_t::setThreadName (const char *name_)
*/
if (!name_)
return;
@@ -21,9 +21,9 @@ index a1086b0c..9943f354 100644
#if defined(ZMQ_HAVE_PTHREAD_SETNAME_1)
int rc = pthread_setname_np (name_);
if (rc)
-@@ -323,6 +323,8 @@ void zmq::thread_t::setThreadName (const char *name_)
+@@ -324,6 +324,8 @@ void zmq::thread_t::setThreadName (const char *name_)
#elif defined(ZMQ_HAVE_PTHREAD_SET_NAME)
- pthread_set_name_np (descriptor, name_);
+ pthread_set_name_np (_descriptor, name_);
#endif
+#endif
+ return;