aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2016-03-29 10:41:58 +0200
committerLukas Larsson <[email protected]>2016-03-29 10:41:58 +0200
commitab2e7d33db993937a17bd8005f2914316d949d73 (patch)
treea142b75ccfe11b2ccfc279f4e8270469f4aa870c
parentcf21a6c586f7c6391e38f69e47f9305fefb8061a (diff)
parent0988d9aa2089fdcab9e8261c8953d2ba1867c28e (diff)
downloadotp-ab2e7d33db993937a17bd8005f2914316d949d73.tar.gz
otp-ab2e7d33db993937a17bd8005f2914316d949d73.tar.bz2
otp-ab2e7d33db993937a17bd8005f2914316d949d73.zip
Merge branch 'lukas/erts/fix_pthread_setname_osx/OTP-13439'
* lukas/erts/fix_pthread_setname_osx/OTP-13439: erts: Fix pthread_setname_np warning on osx
-rw-r--r--erts/include/internal/ethread.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/erts/include/internal/ethread.h b/erts/include/internal/ethread.h
index e5c5cdfa33..b23644d361 100644
--- a/erts/include/internal/ethread.h
+++ b/erts/include/internal/ethread.h
@@ -112,6 +112,10 @@ int ethr_assert_failed(const char *file, int line, const char *func, char *a);
#error "_GNU_SOURCE not defined. Please, compile all files with -D_GNU_SOURCE."
#endif
+#ifdef ETHR_HAVE_PTHREAD_SETNAME_NP_1
+#define _DARWIN_C_SOURCE
+#endif
+
#if defined(ETHR_NEED_NPTL_PTHREAD_H)
#include <nptl/pthread.h>
#elif defined(ETHR_HAVE_MIT_PTHREAD_H)