From c704bcbb880386f96e0e992554afbe3fcc3f0758 Mon Sep 17 00:00:00 2001 From: cherierm Date: Thu, 4 Oct 2007 07:44:50 +0000 Subject: [PATCH] uncomment the special definition of XBT_LOG_NEW_DEFAULT_CATEGORY macro for Windows. The windows version of the lib need it git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@4767 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- include/xbt/log.h | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/include/xbt/log.h b/include/xbt/log.h index 0a307f2d4e..e06fdf380d 100644 --- a/include/xbt/log.h +++ b/include/xbt/log.h @@ -160,26 +160,22 @@ typedef enum { * Creates a new subcategory of the root category and makes it the default * (used by macros that don't explicitly specify a category). */ - - /* #if (defined(_WIN32) && !defined(DLL_STATIC)) # define XBT_LOG_NEW_ROOT_SUBCATEGORY(cname,desc) \ XBT_EXPORT_NO_IMPORT(s_xbt_log_category_t) _XBT_LOGV(cname) = { \ 0, 0, 0, \ #cname, xbt_log_priority_uninitialized, 1, \ - 0, 1 \ + 0, 0, 1 \ } # define XBT_LOG_NEW_DEFAULT_CATEGORY(cname,desc) \ XBT_LOG_NEW_ROOT_SUBCATEGORY(cname,desc); \ XBT_LOG_DEFAULT_CATEGORY(cname) #else -*/ # define XBT_LOG_NEW_DEFAULT_CATEGORY(cname,desc) \ XBT_LOG_NEW_CATEGORY(cname,desc); \ XBT_LOG_DEFAULT_CATEGORY(cname) - -//#endif +#endif @@ -347,7 +343,7 @@ 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); +extern XBT_PUBLIC_DATA(s_xbt_log_category_t) _XBT_LOGV(XBT_LOG_ROOT_CAT); XBT_LOG_EXTERNAL_CATEGORY(GRAS); -- 2.20.1