replace smpi_simulated main by smpi_simulated_main__, because __ is wanted by fortran...

C compilers don't really care how we name it.

diff --git a/include/smpi/smpi.h b/include/smpi/smpi.h
index 3259705..950d924 100644 (file)
--- a/include/smpi/smpi.h
+++ b/include/smpi/smpi.h
@@ -508,7 +508,7 @@ XBT_PUBLIC(void*) smpi_shared_set_call(const char* func, const char* input, void
                                          : smpi_shared_set_call(#func, input, func(__VA_ARGS__)))
 
 /* Fortran specific stuff */
-XBT_PUBLIC(int) __attribute__((weak)) smpi_simulated_main(int argc, char** argv);
+XBT_PUBLIC(int) __attribute__((weak)) smpi_simulated_main__(int argc, char** argv);
 XBT_PUBLIC(int) __attribute__((weak)) MAIN__(void);
 XBT_PUBLIC(int) smpi_main(int (*realmain) (int argc, char *argv[]),int argc, char *argv[]);
 

diff --git a/include/smpi/smpi_main.h b/include/smpi/smpi_main.h
index 0e5d259..5ab2199 100644 (file)
--- a/include/smpi/smpi_main.h
+++ b/include/smpi/smpi_main.h
@@ -1,6 +1,6 @@
-#define main smpi_simulated_main(int argc, char **argv);\
+#define main smpi_simulated_main__(int argc, char **argv);\
 int main(int argc, char **argv){\
-MAIN__(&smpi_simulated_main,&argc,argv);\
+MAIN__(&smpi_simulated_main__,&argc,argv);\
 return 0;\
 }\
-int smpi_simulated_main
+int smpi_simulated_main__

diff --git a/src/smpi/smpi_global.c b/src/smpi/smpi_global.c
index bc190ba..e1b9909 100644 (file)
--- a/src/smpi/smpi_global.c
+++ b/src/smpi/smpi_global.c
@@ -289,17 +289,17 @@ void smpi_global_destroy(void)
 int __attribute__((weak)) xargc;
 char** __attribute__((weak)) xargv;
 
-int __attribute__((weak)) smpi_simulated_main(int argc, char** argv) {
+int __attribute__((weak)) smpi_simulated_main__(int argc, char** argv) {
   xbt_die("Should not be in this smpi_simulated_main");
   return 1;
 }
 
 int __attribute__((weak)) main(int argc, char** argv) {
-   return smpi_main(smpi_simulated_main,argc,argv);
+   return smpi_main(smpi_simulated_main__,argc,argv);
 }
 
 int __attribute__((weak)) MAIN__(){
-  return smpi_main(smpi_simulated_main,xargc, xargv);
+  return smpi_main(smpi_simulated_main__,xargc, xargv);
 };
 
 int smpi_main(int (*realmain) (int argc, char *argv[]),int argc, char *argv[])

diff --git a/src/smpi/smpicc.in b/src/smpi/smpicc.in
index 29fa702..1d1d843 100755 (executable)
--- a/src/smpi/smpicc.in
+++ b/src/smpi/smpicc.in
@@ -6,7 +6,7 @@ INCLUDEARGS="@includeflag@"
 CMAKE_LINKARGS="-L@libdir@"
 
 if [ "@WIN32@" != "1" ]; then
-  CFLAGS="-O2 -Dmain=smpi_simulated_main"
+  CFLAGS="-O2 -Dmain=smpi_simulated_main__"
   LINKARGS="-lsimgrid -lsmpi -lm"
 else
   CFLAGS="-O2 -include @includedir@/smpi/smpi_main.h"

diff --git a/src/smpi/smpif2c.in b/src/smpi/smpif2c.in
index c620b38..2b77445 100755 (executable)
--- a/src/smpi/smpif2c.in
+++ b/src/smpi/smpif2c.in
@@ -62,7 +62,7 @@ foreach my $fortran (@ARGV) {
          next;
       }
       if(/\/* Main program alias \*\/\s*int\s+.*\s*\(\s*\)\s*{(.*)}/) {
-         $_ = "int smpi_simulated_main(int argc, char** argv) { smpi_process_init(&argc, &argv); $1 }\n";
+         $_ = "int smpi_simulated_main__(int argc, char** argv) { smpi_process_init(&argc, &argv); $1 }\n";
       }
       print $tmp "$_\n";
    }