LBRYCommunity/lbrycrd
1
0
Fork 0
Code Issues 29 Pull requests 1 Projects Releases 32 Packages Wiki Activity

Refresh ZeroMQ 4.3.1 patch

Browse source 
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.
This commit is contained in:
Nathan Marley 2019-09-20 10:01:36 -03:00
parent f8b0b190aa
commit 463a1d5244
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
depends/patches/zeromq/0002-disable-pthread_set_name_np.patch
View file

@ -12,7 +12,7 @@ diff --git a/src/thread.cpp b/src/thread.cpp
index a1086b0c..9943f354 100644 index a1086b0c..9943f354 100644
--- a/src/thread.cpp --- a/src/thread.cpp
+++ b/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_) if (!name_)
return; return;
@ -21,9 +21,9 @@ index a1086b0c..9943f354 100644
#if defined(ZMQ_HAVE_PTHREAD_SETNAME_1) #if defined(ZMQ_HAVE_PTHREAD_SETNAME_1)
int rc = pthread_setname_np (name_); int rc = pthread_setname_np (name_);
if (rc) 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) #elif defined(ZMQ_HAVE_PTHREAD_SET_NAME)
pthread_set_name_np (descriptor, name_); pthread_set_name_np (_descriptor, name_);
#endif #endif
+#endif +#endif
+ return; + return;