From: David Schmidt <david__schmidt@users.sourceforge.net>
Date: Mon, 21 Jan 2008 18:56:46 +0000 (+0000)
Subject: Swap #def from negative to positive, re-joined it so it didn't span an assertion... 
X-Git-Tag: v_3_0_9~277
X-Git-Url: http://www.privoxy.org/gitweb/show-status?a=commitdiff_plain;h=f319188cb67aeb355b7134327c7b491724689a41;p=privoxy.git

Swap #def from negative to positive, re-joined it so it didn't span an assertion (compilation failure on OS/2)
---

diff --git a/errlog.c b/errlog.c
index c6c9b28f..e3644fd3 100644
--- a/errlog.c
+++ b/errlog.c
@@ -1,4 +1,4 @@
-const char errlog_rcs[] = "$Id: errlog.c,v 1.62 2007/11/30 15:33:46 fabiankeil Exp $";
+const char errlog_rcs[] = "$Id: errlog.c,v 1.63 2007/12/15 19:49:32 fabiankeil Exp $";
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/errlog.c,v $
@@ -33,6 +33,11 @@ const char errlog_rcs[] = "$Id: errlog.c,v 1.62 2007/11/30 15:33:46 fabiankeil E
  *
  * Revisions   :
  *    $Log: errlog.c,v $
+ *    Revision 1.63  2007/12/15 19:49:32  fabiankeil
+ *    Stop overloading logfile to control the mingw32 log window as well.
+ *    It's no longer necessary now that we disable all debug lines by default
+ *    and at least one user perceived it as a regression (added in 1.55).
+ *
  *    Revision 1.62  2007/11/30 15:33:46  fabiankeil
  *    Unbreak LOG_LEVEL_FATAL. It wasn't fatal with logging disabled
  *    and on mingw32 fatal log messages didn't end up in the log file.
@@ -1150,11 +1155,13 @@ void log_error(int loglevel, const char *fmt, ...)
       loglevel = LOG_LEVEL_FATAL;
    }
 
+#ifdef _WIN32
+   assert(loglevel & debug);
+#else
    assert(
-#ifndef _WIN32
           (NULL != logfp) ||
-#endif
           (loglevel & debug));
+#endif
 
    if (loglevel == LOG_LEVEL_FATAL)
    {