A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
effect of redefinition of the macro XBT_PUBLIC_DATA
[simgrid.git]
/
include
/
xbt
/
ex.h
diff --git
a/include/xbt/ex.h
b/include/xbt/ex.h
index
c0e20d1
..
0eda539
100644
(file)
--- 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) */
/* 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 <errno.h>
/* required ISO-C standard facilities */
#include <errno.h>
@@
-30,7
+30,7
@@
extern int backtrace (void **__array, int __size);
#undef __EX_MAYDAY
#ifdef __EX_MAYDAY
#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 \
# define MAYDAY_SAVE(m) printf("%d %s:%d save %p\n", \
gras_os_getpid(),__FILE__,__LINE__, \
(m)->jb \
@@
-51,8
+51,6
@@
int gras_os_getpid(void);
/*-*-* end of debugging stuff *-*-*/
/*-*-* end of debugging stuff *-*-*/
-
-/* the machine context */
#if defined(__EX_MCTX_MCSC__)
#include <ucontext.h> /* POSIX.1 ucontext(3) */
#define __ex_mctx_struct ucontext_t uc;
#if defined(__EX_MCTX_MCSC__)
#include <ucontext.h> /* POSIX.1 ucontext(3) */
#define __ex_mctx_struct ucontext_t uc;
@@
-232,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 */
*/
/* 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 {
/** @brief different kind of errors */
typedef enum {
@@
-247,7
+245,7
@@
typedef enum {
thread_error /**< error while [un]locking */
} xbt_errcat_t;
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 {
/** @brief Structure describing an exception */
typedef struct {
@@
-311,12
+309,12
@@
typedef struct {
/* the exception context */
typedef ex_ctx_t *(*ex_ctx_cb_t)(void);
/* the exception context */
typedef ex_ctx_t *(*ex_ctx_cb_t)(void);
-extern 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 *);
extern ex_ctx_t *__xbt_ex_ctx_default(void);
/* the termination handler */
typedef void (*ex_term_cb_t)(xbt_ex_t *);
-extern 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
extern void __xbt_ex_terminate_default(xbt_ex_t *e);
/** @brief Introduce a block where exception may be dealed with
@@
-507,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 */
#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__ */
/** @} */
#endif /* __XBT_EX_H__ */