Export public data in a way where we can specify that they are extern C

[simgrid.git] / include / xbt / ex.h

diff --git a/include/xbt/ex.h b/include/xbt/ex.h
index 92c87ff..9684a8c 100644 (file)
--- a/include/xbt/ex.h
+++ b/include/xbt/ex.h
@@ -21,15 +21,14 @@
    Instead, copy the parts we need (and fake when it's not there) */
 XBT_PUBLIC(int) backtrace (void **__array, int __size);
 
-/* required ISO-C standard facilities */
-#include <errno.h>
-#include <stdio.h>
-
 
 /*-*-* Emergency debuging: define this when the exceptions get crazy *-*-*/
 #undef __EX_MAYDAY
 
 #ifdef __EX_MAYDAY
+# include <stdio.h>
+#include <errno.h>
+
 XBT_PUBLIC(int) gras_os_getpid(void);
 #  define MAYDAY_SAVE(m)    printf("%d %s:%d save %p\n",                \
                                    gras_os_getpid(),__FILE__,__LINE__,  \
@@ -310,12 +309,12 @@ typedef struct {
 
 /* the exception context */
 typedef ex_ctx_t *(*ex_ctx_cb_t)(void);
-extern ex_ctx_cb_t XBT_PUBLIC_DATA __xbt_ex_ctx;
+extern XBT_PUBLIC_DATA(ex_ctx_cb_t) __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_term_cb_t XBT_PUBLIC_DATA __xbt_ex_terminate;
+extern XBT_PUBLIC_DATA(ex_term_cb_t) __xbt_ex_terminate;
 extern void __xbt_ex_terminate_default(xbt_ex_t *e);
 
 /** @brief Introduce a block where exception may be dealed with