From: Kern Sibbald <kern@sibbald.com>
Date: Wed, 13 Oct 2004 16:35:57 +0000 (+0000)
Subject: Correct #ifdefing for CONSOLEs
X-Git-Tag: Release-1.36.0~16
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=f8bfe520c1ae848d416a355a72cb70beca2cd449;p=bacula%2Fbacula

Correct #ifdefing for CONSOLEs


git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@1645 91ce42f0-d328-0410-95d8-f526ca767f89
---

diff --git a/bacula/src/lib/util.c b/bacula/src/lib/util.c
index 7ac8df6863..52dbe698ae 100644
--- a/bacula/src/lib/util.c
+++ b/bacula/src/lib/util.c
@@ -126,7 +126,7 @@ unbash_spaces(POOL_MEM &pm)
    }
 }
 
-#ifdef WIN32
+#if    HAVE_WIN32 && !HAVE_CONSOLE && !HAVE_WXCONSOLE
 extern long _timezone;
 extern int _daylight;
 extern long _dstbias;
@@ -139,7 +139,7 @@ char *encode_time(time_t time, char *buf)
    struct tm tm;
    int n = 0;
 
-#ifdef WIN32
+#if    HAVE_WIN32 && !HAVE_CONSOLE && !HAVE_WXCONSOLE
     /*
      * Gross kludge to avoid a seg fault in Microsoft's CRT localtime_r(),
      *	which incorrectly references a NULL returned from gmtime() if