[GNUnet-SVN] r8481 - in gnunet/src: include util

[gnunet]

Author: durner
Date: 2009-05-29 15:43:58 -0600 (Fri, 29 May 2009)
New Revision: 8481

Modified:
   gnunet/src/include/platform.h
   gnunet/src/include/winproc.h
   gnunet/src/util/common_logging.c
Log:
fix MinGW

Modified: gnunet/src/include/platform.h
===================================================================
--- gnunet/src/include/platform.h       2009-05-29 19:41:40 UTC (rev 8480)
+++ gnunet/src/include/platform.h       2009-05-29 21:43:58 UTC (rev 8481)
@@ -160,7 +160,9 @@
 
 #include "plibc.h"
 
+#undef HAVE_CONFIG_H
 #include <pthread.h>
+#define HAVE_CONFIG_H 1
 #include <locale.h>
 #ifndef FRAMEWORK_BUILD
 #include "gettext.h"

Modified: gnunet/src/include/winproc.h
===================================================================
--- gnunet/src/include/winproc.h        2009-05-29 19:41:40 UTC (rev 8480)
+++ gnunet/src/include/winproc.h        2009-05-29 21:43:58 UTC (rev 8481)
@@ -44,9 +44,8 @@
 #include <Ntsecapi.h>
 #include <lm.h>
 #include <Aclapi.h>
-#include "gnunet_util.h"
-#include "platform.h"
 
+
 #ifdef __cplusplus
 extern "C"
 {

Modified: gnunet/src/util/common_logging.c
===================================================================
--- gnunet/src/util/common_logging.c    2009-05-29 19:41:40 UTC (rev 8480)
+++ gnunet/src/util/common_logging.c    2009-05-29 21:43:58 UTC (rev 8481)
@@ -123,6 +123,8 @@
  */
 static unsigned int skip_log;
 
+static FILE *GNUNET_stderr;
+
 /**
  * Convert a textual description of a loglevel
  * to the respective GNUNET_GE_KIND.
@@ -163,9 +165,9 @@
       GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_ERROR, "fopen", logfile);
       return GNUNET_SYSERR;
     }
-  if (stderr != NULL)
-    fclose (stderr);
-  stderr = altlog;
+  if (GNUNET_stderr != NULL)
+    fclose (GNUNET_stderr);
+  GNUNET_stderr = altlog;
   return GNUNET_OK;
 }
 
@@ -220,8 +222,8 @@
                 const char *comp, const char *datestr, const char *msg)
 {
   struct CustomLogger *pos;
-  if (stderr != NULL)
-    fprintf (stderr, "%s %s %s %s", datestr, comp,
+  if (GNUNET_stderr != NULL)
+    fprintf (GNUNET_stderr, "%s %s %s %s", datestr, comp,
              GNUNET_error_type_to_string (kind), msg);
   pos = loggers;
   while (pos != NULL)
@@ -396,6 +398,13 @@
   return (const char *) ret.encoding;
 }
 
+/**
+ * Initializer
+ */
+void __attribute__ ((constructor))
+GNUNET_util_cl_init()
+{
+  GNUNET_stderr = stderr;
+}
 
-
 /* end of common_logging.c */