revert 22459 and 22460: HAVE_DECL_SMPI_PROCESS_SET_USER_DATA really is always defined, to 0 or 1 depending on availability of the declaration. But it's only defined when simgrid is enabled

mpi/src/mpi/starpu_mpi_mpi.c

@@ -98,13 +98,15 @@ static int posted_requests = 0, ready_requests = 0, newer_requests, barrier_runn
 
 extern struct _starpu_mpi_req *_starpu_mpi_irecv_common(starpu_data_handle_t data_handle, int source, starpu_mpi_tag_t data_tag, MPI_Comm comm, unsigned detached, unsigned sync, void (*callback)(void *), void *arg, int sequential_consistency, int is_internal_req, starpu_ssize_t count);
 
+#ifdef STARPU_SIMGRID
 #pragma weak smpi_simulated_main_
 extern int smpi_simulated_main_(int argc, char *argv[]);
 
 #pragma weak smpi_process_set_user_data
-#if !defined(HAVE_DECL_SMPI_PROCESS_SET_USER_DATA)
+#if !HAVE_DECL_SMPI_PROCESS_SET_USER_DATA
 extern void smpi_process_set_user_data(void *);
 #endif
+#endif
 
 void _starpu_mpi_request_init(struct _starpu_mpi_req **req)
 {

src/common/thread.c

@@ -243,7 +243,7 @@ int starpu_pthread_key_delete(starpu_pthread_key_t key)
 
 /* We need it only when using smpi */
 #pragma weak smpi_process_get_user_data
-#if !defined(HAVE_DECL_SMPI_PROCESS_SET_USER_DATA)
+#if !HAVE_DECL_SMPI_PROCESS_SET_USER_DATA
 extern void *smpi_process_get_user_data();
 #endif