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 6b3d98a..22871e3 100644 (file)
--- 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>