From: navarro <navarro@caraja.(none)>
Date: Thu, 25 Oct 2012 18:11:05 +0000 (+0200)
Subject: Fix compilation on linux ;)
X-Git-Tag: v3_9_rc1~91^2~217
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/35b2bd8caf5cc05258414666d9577b39a259cfbd?hp=de6dd9c41648c42ed5e8088be046408cc5ddb8c0;ds=sidebyside

Fix compilation on linux ;)
---

diff --git a/include/smpi/smpi.h b/include/smpi/smpi.h
index 6a4bd096ff..2d94d6a065 100644
--- a/include/smpi/smpi.h
+++ b/include/smpi/smpi.h
@@ -494,7 +494,8 @@ 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) MAIN__(int (*realmain) (int argc, char *argv[]),int *argc, char *argv[]);
+XBT_PUBLIC(int) __attribute__((weak)) smpi_simulated_main(int argc, char** argv);
+XBT_PUBLIC(int) MAIN__(int (*realmain) (int argc, char *argv[]),int argc, char *argv[]);
 
 XBT_PUBLIC(int) smpi_process_index(void);
 
diff --git a/src/include/surf/surf.h b/src/include/surf/surf.h
index ffe8fa5ec0..f5de0740f2 100644
--- a/src/include/surf/surf.h
+++ b/src/include/surf/surf.h
@@ -673,11 +673,11 @@ XBT_PUBLIC_DATA(xbt_dynar_t) model_list;
 /*** SURF Globals **************************/
 /*******************************************/
 XBT_PUBLIC_DATA(xbt_cfg_t) _surf_cfg_set;
-XBT_PUBLIC(int) surf_cfg_get_int(char* name);
-XBT_PUBLIC(double) surf_cfg_get_double(char* name);
-XBT_PUBLIC(char*) surf_cfg_get_string(char* name);
+XBT_PUBLIC(int) surf_cfg_get_int(const char* name);
+XBT_PUBLIC(double) surf_cfg_get_double(const char* name);
+XBT_PUBLIC(char*) surf_cfg_get_string(const char* name);
 XBT_PUBLIC(void) surf_cfg_get_peer(const char *name, char **peer, int *port);
-XBT_PUBLIC(xbt_dynar_t) surf_cfg_get_dynar(char* name);
+XBT_PUBLIC(xbt_dynar_t) surf_cfg_get_dynar(const char* name);
 
 /** \ingroup SURF_simulation
  *  \brief Initialize SURF
diff --git a/src/smpi/smpi_global.c b/src/smpi/smpi_global.c
index 3b0d6527b9..c69a2df67f 100644
--- a/src/smpi/smpi_global.c
+++ b/src/smpi/smpi_global.c
@@ -288,10 +288,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 +315,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();
diff --git a/src/surf/surf.c b/src/surf/surf.c
index b6aaa569a5..fc1e385857 100644
--- a/src/surf/surf.c
+++ b/src/surf/surf.c
@@ -55,15 +55,15 @@ static const char *disk_drives_letter_table[MAX_DRIVE] = {
 };
 #endif                          /* #ifdef _XBT_WIN32 */
 
-int surf_cfg_get_int(char* name)
+int surf_cfg_get_int(const char* name)
 {
 	return xbt_cfg_get_int(_surf_cfg_set,name);
 }
-double surf_cfg_get_double(char* name)
+double surf_cfg_get_double(const char* name)
 {
 	return xbt_cfg_get_double(_surf_cfg_set,name);
 }
-char* surf_cfg_get_string(char* name)
+char* surf_cfg_get_string(const char* name)
 {
 	return xbt_cfg_get_string(_surf_cfg_set,name);
 }
@@ -71,7 +71,7 @@ void surf_cfg_get_peer(const char *name, char **peer, int *port)
 {
 	xbt_cfg_get_peer(_surf_cfg_set,name, peer, port);
 }
-xbt_dynar_t surf_cfg_get_dynar(char* name)
+xbt_dynar_t surf_cfg_get_dynar(const char* name)
 {
 	return xbt_cfg_get_dynar(_surf_cfg_set,name);
 }