From: Frederic Suter <frederic.suter@cc.in2p3.fr>
Date: Sun, 6 Mar 2016 00:01:43 +0000 (+0100)
Subject: Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid
X-Git-Tag: v3_13~534
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/b984090a5db912c59243b5559c6d29763f088d72?hp=c75293a0bdd986a27775c285b5f1c20919efa665

Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid
---

diff --git a/src/xbt/xbt_os_thread.c b/src/xbt/xbt_os_thread.c
index 6b3d98a48b..22871e3c1a 100644
--- a/src/xbt/xbt_os_thread.c
+++ b/src/xbt/xbt_os_thread.c
@@ -15,6 +15,12 @@
 #endif
 
 #include <pthread.h>
+
+#if defined(__FreeBSD__)
+#include "pthread_np.h"
+#define cpu_set_t cpuset_t
+#endif
+
 #include <limits.h>
 #include <semaphore.h>
 #include <errno.h>