Changeset View
Changeset View
Standalone View
Standalone View
depends/patches/zeromq/0002-disable-pthread_set_name_np.patch
From c9bbdd6581d07acfe8971e4bcebe278a3676cf03 Mon Sep 17 00:00:00 2001 | From c9bbdd6581d07acfe8971e4bcebe278a3676cf03 Mon Sep 17 00:00:00 2001 | ||||
From: mruddy <6440430+mruddy@users.noreply.github.com> | From: mruddy <6440430+mruddy@users.noreply.github.com> | ||||
Date: Sat, 30 Jun 2018 09:57:18 -0400 | Date: Sat, 30 Jun 2018 09:57:18 -0400 | ||||
Subject: [PATCH] disable pthread_set_name_np | Subject: [PATCH] disable pthread_set_name_np | ||||
pthread_set_name_np adds a Glibc requirement on >= 2.12. | pthread_set_name_np adds a Glibc requirement on >= 2.12. | ||||
--- | --- | ||||
src/thread.cpp | 4 +++- | src/thread.cpp | 4 +++- | ||||
1 file changed, 3 insertions(+), 1 deletion(-) | 1 file changed, 3 insertions(+), 1 deletion(-) | ||||
diff --git a/src/thread.cpp b/src/thread.cpp | 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; | ||||
- | - | ||||
+#if 0 | +#if 0 | ||||
#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; | ||||
} | } | ||||
#endif | #endif | ||||
-- | -- | ||||
2.17.1 | 2.17.1 | ||||