X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a8e99d72938eff05fb73e47d8f0e6249512e1930..ad1b4e81c8f354761e994fa74f4b5333c916dd71:/include/xbt/log.h

diff --git a/include/xbt/log.h b/include/xbt/log.h
index edb18df0ee..0d5cc244f3 100644
--- a/include/xbt/log.h
+++ b/include/xbt/log.h
@@ -119,7 +119,7 @@ typedef enum {
  * Defines a new subcategory of the parent. 
  */
 #define XBT_LOG_NEW_SUBCATEGORY(catName, parent, desc)    \
-    XBT_PUBLIC_DATA(s_xbt_log_category_t) _XBT_LOGV(parent); \
+    extern s_xbt_log_category_t _XBT_LOGV(parent); \
     XBT_LOG_NEW_SUBCATEGORY_helper(catName, parent, desc) \
 
 /**
@@ -161,24 +161,23 @@ typedef enum {
 /* Damnit Malek. There is no difference between the WINDOWS version and the regular one.
  * Moreover, portability cruft MUST be kept out of this file. If you need another definition of EXPORT_NO_IMPORT, do so in misc, not here.
  * Killing your crufty definition once again (I hate dupplicated code). Please do not readd them without a good justification
-
+*/
 #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,                    \
+        NULL, NULL, NULL,                    \
 		#cname, xbt_log_priority_uninitialized, 1, \
-        0, 0, 1                                          \
+        NULL, NULL, 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
 
 
 
@@ -246,27 +245,14 @@ struct xbt_log_category_s {
   int additivity;
 };
 
-struct xbt_log_appender_s {
-  void (*do_append) (xbt_log_appender_t this_appender,
-		     char *event);
-  void (*free_) (xbt_log_appender_t this_);
-  void *data;
-};
-
-struct xbt_log_layout_s {
-  void (*do_layout)(xbt_log_layout_t l,
-		    xbt_log_event_t event, const char *fmt);
-  void (*free_) (xbt_log_layout_t l);
-  void *data;
-} ;
-
 struct xbt_log_event_s {
   xbt_log_category_t cat;
   e_xbt_log_priority_t priority;
   const char* fileName;
   const char* functionName;
-  int lineNum;
+  int lineNum; 
   va_list ap;
+  va_list ap_copy; /* need a copy to launch dynamic layouts when the static ones overflowed */
   char buffer[XBT_LOG_BUFF_SIZE];
 };