X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/217b4afb954d1795f011f060767b8d89533f2b71..a8ba146044f5e596efd93d81efd2958cbb1cb3b1:/include/xbt/ex.h diff --git a/include/xbt/ex.h b/include/xbt/ex.h index b7903c152a..909af2c3fb 100644 --- a/include/xbt/ex.h +++ b/include/xbt/ex.h @@ -65,7 +65,7 @@ SG_BEGIN_DECL() # define MAYDAY_CATCH(e) printf("%d %s:%d Catched '%s'\n", \ xbt_getpid(), __FILE__, __LINE__, \ (e).msg \ - ), + ), #else # define MAYDAY_SAVE(m) # define MAYDAY_RESTORE(m) @@ -297,7 +297,7 @@ typedef struct { */ typedef struct { __ex_mctx_t *ctx_mctx; /* permanent machine context of enclosing try/catch */ - volatile int ctx_caught; /* temporary flag whether exception was caught */ + int ctx_caught; /* temporary flag whether exception was caught */ volatile xbt_ex_t exception; /* temporary exception storage */ } xbt_running_ctx_t; @@ -313,12 +313,12 @@ XBT_PUBLIC_DATA(const xbt_running_ctx_t) __xbt_ex_ctx_initializer; /* the exception context */ typedef xbt_running_ctx_t *(*xbt_running_ctx_fetcher_t) (void); XBT_PUBLIC_DATA(xbt_running_ctx_fetcher_t) __xbt_running_ctx_fetch; -extern xbt_running_ctx_t *__xbt_ex_ctx_default(void); +XBT_PUBLIC( xbt_running_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 void __xbt_ex_terminate_default(xbt_ex_t * e); +XBT_PUBLIC( void )__xbt_ex_terminate_default(xbt_ex_t * e); /** @brief Introduce a block where exception may be dealed with * @hideinitializer