Three new functions in xbt_str module: split&join (hello perl) and diff (naive LCS...

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

diff --git a/include/xbt/log.h b/include/xbt/log.h
index afb5d95c07f177111a498b97a367773a723bafff..8bff5c9bb8d9c9ef1f794c186235bb3941bd782f 100644 (file)
--- a/include/xbt/log.h
+++ b/include/xbt/log.h
@@ -124,7 +124,17 @@ typedef enum {
  *
  * Creates a new subcategory of the root category.
  */
-#define XBT_LOG_NEW_CATEGORY(catName,desc)  XBT_LOG_NEW_SUBCATEGORY_helper(catName, XBT_LOG_ROOT_CAT, desc)
+ 
+#if (defined(_WIN32) && !defined(DLL_STATIC))
+# define XBT_LOG_NEW_CATEGORY(catName,desc)  \
+       XBT_EXPORT_NO_IMPORT(s_xbt_log_category_t) _XBT_LOGV(catName) = {       \
+        0, 0, 0,                    \
+               #catName, xbt_log_priority_uninitialized, 1, \
+        0, 1                                          \
+    }
+#else
+# define XBT_LOG_NEW_CATEGORY(catName,desc)  XBT_LOG_NEW_SUBCATEGORY_helper(catName, XBT_LOG_ROOT_CAT, desc)  
+#endif
 
 /**
  * \ingroup XBT_log  
@@ -283,8 +293,8 @@ XBT_PUBLIC(void) _xbt_log_event_log(xbt_log_event_t ev,
                                const char *fmt,
                                ...) _XBT_GNUC_PRINTF(2,3);
 
-XBT_PUBLIC(int) _xbt_log_cat_init(e_xbt_log_priority_t priority, 
-                             xbt_log_category_t   category);
+XBT_PUBLIC(int) _xbt_log_cat_init(xbt_log_category_t   category,
+                                 e_xbt_log_priority_t priority);
 
 
 extern XBT_IMPORT_NO_EXPORT(s_xbt_log_category_t) _XBT_LOGV(XBT_LOG_ROOT_CAT);
@@ -318,7 +328,7 @@ extern xbt_log_appender_t xbt_log_default_appender;
        (priority >= XBT_LOG_STATIC_THRESHOLD                 \
         && priority >= catv.threshold                         \
         && (catv.threshold != xbt_log_priority_uninitialized \
-            || _xbt_log_cat_init(priority, &catv)) )
+            || _xbt_log_cat_init(&catv, priority)) )
 
 /*
  * Internal Macros