SSPCPP-689 Move up to VC14: timezone no longer exists
authorRod Widdowson <rdw@steadingsoftware.com>
Mon, 16 May 2016 09:29:39 +0000 (10:29 +0100)
committerRod Widdowson <rdw@steadingsoftware.com>
Mon, 16 May 2016 09:29:39 +0000 (10:29 +0100)
https://issues.shibboleth.net/jira/browse/SSPCPP-689

timezone is deprecated in VC10 and not present in VC14.
_timezone replaces it.

Make this change, conditional on WIN32

odbc-store/odbc-store.cpp

index 1ad49a2..7f5fa2f 100644 (file)
@@ -230,6 +230,8 @@ namespace {
         t.tm_isdst=0;
 #if defined(HAVE_TIMEGM)
         ret = timegm(&t);
+#elif defined(WIN32)
+        ret = mktime(&t) - _timezone;
 #else
         ret = mktime(&t) - timezone;
 #endif