From: Arnaud Giersch <arnaud.giersch@iut-bm.univ-fcomte.fr>
Date: Wed, 18 May 2011 12:30:38 +0000 (+0200)
Subject: [gras] Don't define variables twice.
X-Git-Tag: v3_6_rc3~21
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/418a8a2942538b0741691f030b2fa8e6bae47290

[gras] Don't define variables twice.

Declare them "extern" in include files.
Found by compiling with "-fno-common".
---

diff --git a/src/bindings/lua/simgrid_lua.h b/src/bindings/lua/simgrid_lua.h
index 56aa8edbc1..91774956c8 100644
--- a/src/bindings/lua/simgrid_lua.h
+++ b/src/bindings/lua/simgrid_lua.h
@@ -23,9 +23,9 @@
 #include <stdarg.h>
 
 
-xbt_dict_t process_function_set;
-xbt_dynar_t process_list;
-xbt_dict_t machine_set;
+extern xbt_dict_t process_function_set;
+extern xbt_dynar_t process_list;
+extern xbt_dict_t machine_set;
 
 typedef struct s_process_t {
   int argc;
diff --git a/tools/gras/gras_stub_generator.h b/tools/gras/gras_stub_generator.h
index 189f7b68ae..e50590ffd1 100644
--- a/tools/gras/gras_stub_generator.h
+++ b/tools/gras/gras_stub_generator.h
@@ -15,16 +15,16 @@
 
 #include "xbt/dynar.h"
 #include "xbt/dict.h"
-xbt_dict_t process_function_set;
-xbt_dynar_t process_list;
-xbt_dict_t machine_set;
+extern xbt_dict_t process_function_set;
+extern xbt_dynar_t process_list;
+extern xbt_dict_t machine_set;
+extern char *warning;
 
 typedef struct s_process_t {
   int argc;
   char **argv;
   char *host;
 } s_process_t;
-char *warning;
 
 void s_process_free(void *process);
 
diff --git a/tools/gras/stub_generator.c b/tools/gras/stub_generator.c
index 0b1bd177f3..dfe760ce2d 100644
--- a/tools/gras/stub_generator.c
+++ b/tools/gras/stub_generator.c
@@ -40,6 +40,7 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(stubgen, gras, "Stub generator");
 xbt_dict_t process_function_set = NULL;
 xbt_dynar_t process_list = NULL;
 xbt_dict_t machine_set = NULL;
+char *warning = NULL;
 
 void s_process_free(void *process)
 {
diff --git a/tools/gras/unix_stub_generator.c b/tools/gras/unix_stub_generator.c
index fade69be39..42aabfc17d 100644
--- a/tools/gras/unix_stub_generator.c
+++ b/tools/gras/unix_stub_generator.c
@@ -58,8 +58,6 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(stubgen);
 #define MAKEFILE_FILENAME_REMOTE  "%s.Makefile.remote"
 #define DEPLOYMENT  "%s.deploy.sh"
 
-char *warning = NULL;
-
 /**********************************************/
 /**** Generate the file for the simulator *****/
 /**********************************************/