util/u_thread: include pthread_np.h if found

[mesa.git] / src / util / u_thread.h

diff --git a/src/util/u_thread.h b/src/util/u_thread.h
index 1f2a104c3fd65e9747715294690aee6ec950df8b..af44bcfc1bd6c0ab97b9ca27e146e49a8c4966f8 100644 (file)
--- 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
@@ -45,6 +45,10 @@
 #endif
 
 #ifdef __FreeBSD__
+/* pthread_np.h -> sys/param.h -> machine/param.h
+ * - defines ALIGN which clashes with our ALIGN
+ */
+#undef ALIGN
 #define cpu_set_t cpuset_t
 #endif