use the XBT_EXPORT_NO_IMPORT macro instead XBT_PUBLIC_DATA and add the keyword extern...

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@4847 48e7efb5-ca39-0410-a469-dd3cf9ba447f

diff --git a/include/xbt/misc.h b/include/xbt/misc.h
index cb1ef33..44a3b79 100644 (file)
--- a/include/xbt/misc.h
+++ b/include/xbt/misc.h
@@ -149,7 +149,7 @@
 #  define XBT_PUBLIC(type)            extern type
 #  define XBT_EXPORT_NO_IMPORT(type)  type
 #  define XBT_IMPORT_NO_EXPORT(type)  type
-#  define XBT_PUBLIC_DATA(type)       type
+#  define XBT_PUBLIC_DATA(type)       extern type
 #endif
    
 #if !defined (max) && !defined(__cplusplus)

diff --git a/src/gras/Virtu/rl_process.c b/src/gras/Virtu/rl_process.c
index c3a2920..7ae8b78 100644 (file)
--- a/src/gras/Virtu/rl_process.c
+++ b/src/gras/Virtu/rl_process.c
@@ -13,7 +13,7 @@
 
 /* globals */
 static gras_procdata_t *_gras_procdata = NULL;
-XBT_PUBLIC_DATA(char const *) _gras_procname = NULL;
+XBT_EXPORT_NO_IMPORT(char const *) _gras_procname = NULL;
 
 void gras_process_init() {
   _gras_procdata=xbt_new0(gras_procdata_t,1);

diff --git a/src/xbt/ex.c b/src/xbt/ex.c
index 21215dd..9004110 100644 (file)
--- a/src/xbt/ex.c
+++ b/src/xbt/ex.c
@@ -368,8 +368,8 @@ void __xbt_ex_terminate_default(xbt_ex_t *e)  {
 }
 
 /* the externally visible API */
-XBT_PUBLIC_DATA(ex_ctx_cb_t)  __xbt_ex_ctx       = &__xbt_ex_ctx_default;
-XBT_PUBLIC_DATA(ex_term_cb_t) __xbt_ex_terminate = &__xbt_ex_terminate_default;
+XBT_EXPORT_NO_IMPORT(ex_ctx_cb_t)  __xbt_ex_ctx       = &__xbt_ex_ctx_default;
+XBT_EXPORT_NO_IMPORT(ex_term_cb_t) __xbt_ex_terminate = &__xbt_ex_terminate_default;
 
 
 void xbt_ex_free(xbt_ex_t e) {