add various defines and objects to provide better compilation support (all C tests...

[simgrid.git] / src / smpi / smpi_global.c

diff --git a/src/smpi/smpi_global.c b/src/smpi/smpi_global.c
index 3b0d652..24e869c 100644 (file)
--- a/src/smpi/smpi_global.c
+++ b/src/smpi/smpi_global.c
@@ -35,6 +35,10 @@ static int process_count = 0;
 
 MPI_Comm MPI_COMM_WORLD = MPI_COMM_NULL;
 
+MPI_Errhandler* MPI_ERRORS_RETURN = NULL;
+MPI_Errhandler* MPI_ERRORS_ARE_FATAL = NULL;
+MPI_Errhandler* MPI_ERRHANDLER_NULL = NULL;
+
 #define MAILBOX_NAME_MAXLEN (5 + sizeof(int) * 2 + 1)
 
 static char* get_mailbox_name(char* str, int index) {
@@ -288,10 +292,10 @@ int __attribute__((weak)) smpi_simulated_main(int argc, char** argv) {
 }
 
 int __attribute__((weak)) main(int argc, char** argv) {
-   return MAIN__(&smpi_simulated_main,argc,argv);
+   return MAIN__(smpi_simulated_main,argc,argv);
 }
 
-int MAIN__(int (*realmain) (int argc, char *argv[]),int *argc, char *argv[])
+int MAIN__(int (*realmain) (int argc, char *argv[]),int argc, char *argv[])
 {
   srand(SMPI_RAND_SEED);
 
@@ -315,10 +319,10 @@ int MAIN__(int (*realmain) (int argc, char *argv[]),int *argc, char *argv[])
   XBT_LOG_CONNECT(smpi_replay);
 
 #ifdef HAVE_TRACING
-  TRACE_global_init(argc, argv);
+  TRACE_global_init(&argc, argv);
 #endif
 
-  SIMIX_global_init(argc, argv);
+  SIMIX_global_init(&argc, argv);
 
 #ifdef HAVE_TRACING
   TRACE_start();