From: cherierm Date: Wed, 14 Mar 2007 21:24:35 +0000 (+0000) Subject: effect of redefinition of the macro XBT_PUBLIC_DATA X-Git-Tag: v3.3~2086 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/dcbbc368228a7623d2f8a53028f6da8f64a5a128?ds=sidebyside effect of redefinition of the macro XBT_PUBLIC_DATA git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@3273 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- diff --git a/include/xbt/ex.h b/include/xbt/ex.h index 9a7e3c45df..0eda539c6a 100644 --- a/include/xbt/ex.h +++ b/include/xbt/ex.h @@ -309,12 +309,12 @@ typedef struct { /* the exception context */ typedef ex_ctx_t *(*ex_ctx_cb_t)(void); -XBT_PUBLIC_DATA(ex_ctx_cb_t) __xbt_ex_ctx; +extern ex_ctx_cb_t XBT_PUBLIC_DATA __xbt_ex_ctx; extern ex_ctx_t *__xbt_ex_ctx_default(void); /* the termination handler */ typedef void (*ex_term_cb_t)(xbt_ex_t *); -XBT_PUBLIC_DATA(ex_term_cb_t) __xbt_ex_terminate; +extern ex_term_cb_t XBT_PUBLIC_DATA __xbt_ex_terminate; extern void __xbt_ex_terminate_default(xbt_ex_t *e); /** @brief Introduce a block where exception may be dealed with diff --git a/src/xbt/ex.c b/src/xbt/ex.c index e45ecf194e..02e8edcebd 100644 --- a/src/xbt/ex.c +++ b/src/xbt/ex.c @@ -267,8 +267,8 @@ void __xbt_ex_terminate_default(xbt_ex_t *e) { } /* the externally visible API */ -ex_ctx_cb_t __xbt_ex_ctx = &__xbt_ex_ctx_default; -ex_term_cb_t __xbt_ex_terminate = &__xbt_ex_terminate_default; +ex_ctx_cb_t XBT_PUBLIC_DATA __xbt_ex_ctx = &__xbt_ex_ctx_default; +ex_term_cb_t XBT_PUBLIC_DATA __xbt_ex_terminate = &__xbt_ex_terminate_default; void xbt_ex_free(xbt_ex_t e) {