Solve variable init value for windows.

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

diff --git a/include/xbt/log.h b/include/xbt/log.h
index cd31e12..77f036b 100644 (file)
--- a/include/xbt/log.h
+++ b/include/xbt/log.h
@@ -1,8 +1,7 @@
-/* $Id$ */
-

 /* log - a generic logging facility in the spirit of log4j                  */
 
 /* log - a generic logging facility in the spirit of log4j                  */
 

-/* Copyright (c) 2003, 2004 Martin Quinson. All rights reserved.            */
+/* Copyright (c) 2004, 2005, 2006, 2007, 2008, 2009, 2010. The SimGrid Team.
+ * All rights reserved.                                                     */

 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */


@@ -35,6 +34,7 @@
 #define _XBT_LOG_H_
 
 #include "xbt/misc.h"
 #define _XBT_LOG_H_
 
 #include "xbt/misc.h"

+#include "gras_config.h"

 
 #include <stdarg.h>
 SG_BEGIN_DECL()
 
 #include <stdarg.h>
 SG_BEGIN_DECL()


@@ -93,7 +93,7 @@ SG_BEGIN_DECL()
 /* The root of the category hierarchy. */
 #define XBT_LOG_ROOT_CAT   root
 
 /* The root of the category hierarchy. */
 #define XBT_LOG_ROOT_CAT   root
 

-/* In stric ansi C, we are not allowed to initialize a variable with 
+/* In strict ansi C, we are not allowed to initialize a variable with

  * a non-constant value. But the whole tree of categories is
  * connected by setting the address of the parent category as a field
  * of the child one.
  * a non-constant value. But the whole tree of categories is
  * connected by setting the address of the parent category as a field
  * of the child one.


@@ -168,7 +168,7 @@ SG_BEGIN_DECL()
  * Indicates which category is the default one.
  */
 
  * Indicates which category is the default one.
  */
 

-#if defined(XBT_LOG_MAYDAY)     /*|| defined (NLOG) * turning logging off */
+#if defined(XBT_LOG_MAYDAY) || defined(SUPERNOVAE_MODE)     /*|| defined (NLOG) * turning logging off */

 # define XBT_LOG_DEFAULT_CATEGORY(cname)
 #else
 # define XBT_LOG_DEFAULT_CATEGORY(cname) \
 # define XBT_LOG_DEFAULT_CATEGORY(cname)
 #else
 # define XBT_LOG_DEFAULT_CATEGORY(cname) \