From: Aki Tuomi <cmouse@cmouse.fi>
Date: Fri, 18 Jul 2014 05:50:58 +0000 (+0300)
Subject: YaHTTP upgrade from upstream
X-Git-Tag: auth-3.4.0-rc1~70^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c0319be8f5e87450d6658256faccb6e93eb9a65c;p=thirdparty%2Fpdns.git

YaHTTP upgrade from upstream
---

diff --git a/pdns/ext/yahttp/yahttp/utility.hpp b/pdns/ext/yahttp/yahttp/utility.hpp
index 0242fbb8fb..dcd52077d9 100644
--- a/pdns/ext/yahttp/yahttp/utility.hpp
+++ b/pdns/ext/yahttp/yahttp/utility.hpp
@@ -49,18 +49,16 @@ namespace YaHTTP {
        struct tm *tm;
        tm = localtime(&t);
        fromTm(tm);
-# ifndef HAVE_TM_GMTOFF
+#endif
+#ifndef HAVE_TM_GMTOFF
        time_t t2;
-#  ifdef HAVE_LOCALTIME_R
+# ifdef HAVE_LOCALTIME_R
        gmtime_r(&t, &tm);
        t2 = mktime(&tm);
-#  else
+# else
        tm = gmtime(&t);
        t2 = mktime(tm);
-#  endif
 # endif
-#endif
-#ifndef HAVE_TM_GMTOFF
        this->utc_offset = ((t2-t)/10)*10; // removes any possible differences. 
 #endif
      }; //<! uses localtime for time