fix multiple definitions

mpi/src/mpi/starpu_mpi_mpi.c

@@ -88,6 +88,7 @@ static int mpi_driver_task_freq = 0;
 static int wait_counter;
 static starpu_pthread_cond_t wait_counter_cond;
 static starpu_pthread_mutex_t wait_counter_mutex;
+starpu_pthread_queue_t dontsleep;
 #endif
 
 /* Count requests posted by the application and not yet submitted to MPI */

mpi/src/starpu_mpi_private.h

@@ -40,8 +40,8 @@ extern "C"
 #endif
 
 #ifdef STARPU_SIMGRID
-starpu_pthread_wait_t wait;
-starpu_pthread_queue_t dontsleep;
+extern starpu_pthread_wait_t wait;
+extern starpu_pthread_queue_t dontsleep;
 
 struct _starpu_simgrid_mpi_req
 {

src/core/detect_combined_workers.c

@@ -23,11 +23,11 @@
 #include <math.h>
 #include <core/detect_combined_workers.h>
 
+int _starpu_initialized_combined_workers;
+
 #ifdef STARPU_HAVE_HWLOC
 #include <hwloc.h>
 
-int _starpu_initialized_combined_workers;
-
 static void find_workers(hwloc_obj_t obj, int cpu_workers[STARPU_NMAXWORKERS], unsigned *n)
 {
 	struct _starpu_hwloc_userdata *data = obj->userdata;