X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c9cec0dc29c4015e8600560b23772f22076044d7..3ae39088350ad665caa35db1731009d9e3f1bda2:/include/xbt/ex.h diff --git a/include/xbt/ex.h b/include/xbt/ex.h index 037b808c8c..339848c1bd 100644 --- a/include/xbt/ex.h +++ b/include/xbt/ex.h @@ -19,7 +19,7 @@ /* do not include execinfo.h directly since it's not always available. Instead, copy the parts we need (and fake when it's not there) */ -extern int backtrace (void **__array, int __size); +XBT_PUBLIC(int) backtrace (void **__array, int __size); /* required ISO-C standard facilities */ #include @@ -30,7 +30,7 @@ extern int backtrace (void **__array, int __size); #undef __EX_MAYDAY #ifdef __EX_MAYDAY -int gras_os_getpid(void); +XBT_PUBLIC(int) gras_os_getpid(void); # define MAYDAY_SAVE(m) printf("%d %s:%d save %p\n", \ gras_os_getpid(),__FILE__,__LINE__, \ (m)->jb \ @@ -51,12 +51,7 @@ int gras_os_getpid(void); /*-*-* end of debugging stuff *-*-*/ - -/* the machine context */ -#if defined(_WIN32) || defined(__WIN32__) || defined(WIN32) || defined(__TOS_WIN__) -#include "xbt/win32_context.h" - -#elif defined(__EX_MCTX_MCSC__) +#if defined(__EX_MCTX_MCSC__) #include /* POSIX.1 ucontext(3) */ #define __ex_mctx_struct ucontext_t uc; #define __ex_mctx_save(mctx) (getcontext(&(mctx)->uc) == 0) @@ -235,7 +230,7 @@ typedef struct { __ex_mctx_struct } __ex_mctx_t; */ /* we need this symbol here, even if it breaks a bit the module separation */ -long int gras_os_getpid(void); +XBT_PUBLIC(long) int gras_os_getpid(void); /** @brief different kind of errors */ typedef enum { @@ -250,7 +245,7 @@ typedef enum { thread_error /**< error while [un]locking */ } xbt_errcat_t; -const char * xbt_ex_catname(xbt_errcat_t cat); +XBT_PUBLIC(const char *) xbt_ex_catname(xbt_errcat_t cat); /** @brief Structure describing an exception */ typedef struct { @@ -510,10 +505,10 @@ extern void __xbt_ex_terminate_default(xbt_ex_t *e); #define RETHROW5(msg,a,b,c,d,e) _XBT_PRE_RETHROW msg,a,b,c,d,e, _XBT_POST_RETHROW /** @brief Exception destructor */ -void xbt_ex_free(xbt_ex_t e); +XBT_PUBLIC(void) xbt_ex_free(xbt_ex_t e); -void xbt_ex_display(xbt_ex_t *e); -void xbt_backtrace_display(void); +XBT_PUBLIC(void) xbt_ex_display(xbt_ex_t *e); +XBT_PUBLIC(void) xbt_backtrace_display(void); /** @} */ #endif /* __XBT_EX_H__ */