commit 55765f80b9ce7cce4ec6a1c2bed6476776d9cbed
author Jonathan Gray <jsg@jsg.id.au> Wed Jun 24 23:27:52 2020 +1000
committer Marge Bot <eric+marge@anholt.net> Mon Aug 31 09:14:57 2020 +0000
tree 4c359cc9d0de8e9c7fb96bb0e55720db2bb9a5e6
parent c66c5b38e0ad136aa9301fd60aafea736d433c57

util/u_thread: include pthread_np.h if found

Required for pthread_set_name_np() on OpenBSD as there is no
pthread_setaffinity_np() to define PTHREAD_SETAFFINITY_IN_NP_HEADER.

Fixes: dcf9d91a80e ("util: Handle differences in pthread_setname_np")
Signed-off-by: Jonathan Gray <jsg@jsg.id.au>
Reviewed-by: Eric Engestrom <eric@engestrom.ch>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5630>

meson.build

diff --git a/meson.build b/meson.build
index b79a378..be00795 100644
--- a/meson.build
+++ b/meson.build
@@ -1206,7 +1206,7 @@
   endif
 endif
 
-foreach h : ['xlocale.h', 'linux/futex.h', 'endian.h', 'dlfcn.h', 'execinfo.h', 'sys/shm.h', 'cet.h']
+foreach h : ['xlocale.h', 'linux/futex.h', 'endian.h', 'dlfcn.h', 'execinfo.h', 'sys/shm.h', 'cet.h', 'pthread_np.h']
   if cc.check_header(h)
     pre_args += '-DHAVE_@0@'.format(h.to_upper().underscorify())
   endif

src/util/u_thread.h

diff --git a/src/util/u_thread.h b/src/util/u_thread.h
index b91d05e..af44bcf 100644
--- a/src/util/u_thread.h
+++ b/src/util/u_thread.h
@@ -35,7 +35,7 @@
 
 #ifdef HAVE_PTHREAD
 #include <signal.h>
-#ifdef PTHREAD_SETAFFINITY_IN_NP_HEADER
+#ifdef HAVE_PTHREAD_NP_H
 #include <pthread_np.h>
 #endif
 #endif