From: Arnaud Giersch <arnaud.giersch@iut-bm.univ-fcomte.fr>
Date: Wed, 18 May 2011 12:28:29 +0000 (+0200)
Subject: [surf] Don't define variable "platform_filename" twice.
X-Git-Tag: v3_6_rc3~22
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/747b40cf246ed62d230ea788de659b52947701d9?ds=sidebyside

[surf] Don't define variable "platform_filename" twice.

Declare it "extern" in include file, and define it elsewhere.
Found by compiling with "-fno-common".
---

diff --git a/include/surf/surfxml_parse.h b/include/surf/surfxml_parse.h
index 6a284e7756..079db3bd9d 100644
--- a/include/surf/surfxml_parse.h
+++ b/include/surf/surfxml_parse.h
@@ -12,10 +12,10 @@
 #include "xbt/function_types.h"
 #include "xbt/dict.h"
 
-char * platform_filename;
-
 SG_BEGIN_DECL()
 
+XBT_PUBLIC_DATA(char *) platform_filename;
+
 /* Hook for the different tags. All the functions which pointer to are push into here are run when the tag is encountered */
 XBT_PUBLIC_DATA(xbt_dynar_t) STag_surfxml_platform_cb_list;
 XBT_PUBLIC_DATA(xbt_dynar_t) ETag_surfxml_platform_cb_list;
diff --git a/src/surf/surfxml_parse.c b/src/surf/surfxml_parse.c
index af80730576..9309801f5e 100644
--- a/src/surf/surfxml_parse.c
+++ b/src/surf/surfxml_parse.c
@@ -16,6 +16,8 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_parse, surf,
 #undef CLEANUP
 #include "simgrid_dtd.c"
 
+char *platform_filename;
+
 /* Initialize the parsing globals */
 xbt_dict_t traces_set_list = NULL;
 xbt_dict_t trace_connect_list_host_avail = NULL;