Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
uncomment the special definition of XBT_LOG_NEW_DEFAULT_CATEGORY macro for Windows.
authorcherierm <cherierm@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Thu, 4 Oct 2007 07:44:50 +0000 (07:44 +0000)
committercherierm <cherierm@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Thu, 4 Oct 2007 07:44:50 +0000 (07:44 +0000)
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

index 0a307f2..e06fdf3 100644 (file)
@@ -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).
  */
  * 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, \
 #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_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)
 # 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);
 
 
                                  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);
 
 
 XBT_LOG_EXTERNAL_CATEGORY(GRAS);