From 27e8e9f73613b93381c59e87e4c68ec16933b2f0 Mon Sep 17 00:00:00 2001 From: cherierm Date: Mon, 22 Oct 2007 15:02:21 +0000 Subject: [PATCH] use the XBT_EXPORT_NO_IMPORT macro instead XBT_PUBLIC_DATA and add the keyword extern to avoid the gcc compiler warnings git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@4847 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- include/xbt/misc.h | 2 +- src/gras/Virtu/rl_process.c | 2 +- src/xbt/ex.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/xbt/misc.h b/include/xbt/misc.h index cb1ef332cb..44a3b79ba1 100644 --- 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 c3a2920760..7ae8b786b2 100644 --- 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 21215dd52a..9004110433 100644 --- 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) { -- 2.20.1