X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6b16f0a1b014f90665507e6354ea7e2c5488bede..5c80d460aa6de6fc6b03496b29a3acbc23d333f4:/include/xbt/log.h

diff --git a/include/xbt/log.h b/include/xbt/log.h
index bbfb46ef04..26efd1358b 100644
--- a/include/xbt/log.h
+++ b/include/xbt/log.h
@@ -98,7 +98,7 @@ typedef enum {
  * to avoid an extra declaration of root when XBT_LOG_NEW_SUBCATEGORY is called by
  * XBT_LOG_NEW_CATEGORY */
 #define XBT_LOG_NEW_SUBCATEGORY_helper(catName, parent, desc) \
-    s_xbt_log_category_t _XBT_LOGV(catName) = {       \
+    XBT_PUBLIC_NO_IMPORT(s_xbt_log_category_t) _XBT_LOGV(catName) = {       \
         &_XBT_LOGV(parent), 0, 0,                    \
         #catName, xbt_log_priority_uninitialized, 1, \
         0, 1                                          \
@@ -194,7 +194,7 @@ typedef enum {
 
 /* Functions you may call */
 
-extern void xbt_log_control_set(const char* cs);
+XBT_PUBLIC(void) xbt_log_control_set(const char* cs);
 
 /* Forward declarations */
 typedef struct xbt_log_appender_s s_xbt_log_appender_t,*xbt_log_appender_t;
@@ -238,7 +238,7 @@ struct xbt_log_event_s {
  *
  * Programatically alters a category's threshold priority (don't use).
  */
-extern void xbt_log_threshold_set(xbt_log_category_t cat,
+XBT_PUBLIC(void) xbt_log_threshold_set(xbt_log_category_t cat,
 				   e_xbt_log_priority_t thresholdPriority);
 
 /**
@@ -248,7 +248,7 @@ extern void xbt_log_threshold_set(xbt_log_category_t cat,
  *
  * Programatically alter a category's parent (don't use).
  */
-extern void xbt_log_parent_set(xbt_log_category_t cat,
+XBT_PUBLIC(void) xbt_log_parent_set(xbt_log_category_t cat,
 				xbt_log_category_t parent);
 
 /**
@@ -258,15 +258,15 @@ extern void xbt_log_parent_set(xbt_log_category_t cat,
  *
  * Programatically sets the category's appender (don't use).
  */
-extern void xbt_log_appender_set(xbt_log_category_t cat,
+XBT_PUBLIC(void) xbt_log_appender_set(xbt_log_category_t cat,
 				  xbt_log_appender_t app);
 
 /* Functions that you shouldn't call. */
-extern void _xbt_log_event_log(xbt_log_event_t ev,
+XBT_PUBLIC(void) _xbt_log_event_log(xbt_log_event_t ev,
 				const char *fmt,
 				...) _XBT_GNUC_PRINTF(2,3);
 
-extern int _xbt_log_cat_init(e_xbt_log_priority_t priority, 
+XBT_PUBLIC(int) _xbt_log_cat_init(e_xbt_log_priority_t priority, 
 			      xbt_log_category_t   category);
 
 
@@ -314,11 +314,13 @@ extern xbt_log_appender_t xbt_log_default_appender;
  * Setting the LogEvent's valist member is done inside _log_logEvent.
  */
 
-#define _XBT_LOG_PRE(catv, priority) do {                              \
-     if (_XBT_LOG_ISENABLEDV(catv, priority)) {                        \
-         s_xbt_log_event_t _log_ev =                                   \
-             {&(catv),priority,__FILE__,_XBT_FUNCTION,__LINE__};         \
-         _xbt_log_event_log(&_log_ev
+#define _XBT_LOG_PRE(catv, priority) do {			 \
+     if (_XBT_LOG_ISENABLEDV(catv, priority)) {                  \
+         s_xbt_log_event_t _log_ev =                             \
+             {NULL,priority,__FILE__,_XBT_FUNCTION,__LINE__};    \
+                _log_ev.cat = &(catv);                           \
+              _xbt_log_event_log(&_log_ev 			 \
+              
 
 #define _XBT_LOG_POST                          \
                         );                      \