From: Victor Julien <victor@inliniac.net>
Date: Mon, 17 Jul 2017 14:19:32 +0000 (+0200)
Subject: mingw: fix 'struct tm' compilation issue
X-Git-Tag: suricata-4.1.0-beta1~398
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3fc73addae250818e93376f891184fb919af609f;p=thirdparty%2Fsuricata.git

mingw: fix 'struct tm' compilation issue
---

diff --git a/src/util-time.c b/src/util-time.c
index d6ba2f7ccd..12d174f0f6 100644
--- a/src/util-time.c
+++ b/src/util-time.c
@@ -420,8 +420,10 @@ time_t SCMkTimeUtc (struct tm *tp)
     result += tp->tm_min;
     result *= 60;
     result += tp->tm_sec;
+#ifndef OS_WIN32
     if (tp->tm_gmtoff)
         result -= tp->tm_gmtoff;
+#endif
     return result;
 }
 
@@ -453,8 +455,10 @@ int SCStringPatternToTime (char *string, const char **patterns, int num_patterns
         tp->tm_hour = tp->tm_min = tp->tm_sec = 0;
         tp->tm_year = tp->tm_mon = tp->tm_mday = tp->tm_wday = INT_MIN;
         tp->tm_isdst = -1;
+#ifndef OS_WIN32
         tp->tm_gmtoff = 0;
         tp->tm_zone = NULL;
+#endif
         result = strptime(string, patterns[i], tp);
 
         if (result && *result == '\0')