[shibboleth-sp2] 32/89: SSPCPP-689 Move up to VC14: timezone no longer exists

[Ferenc Wágner]

This is an automated email from the git hooks/post-receive script.

wferi pushed a commit to branch master
in repository shibboleth-sp2.

commit fdf0975f06afbe2e8f6997d05498c1f14b58b7ef
Author: Rod Widdowson <rdw at steadingsoftware.com>
Date:   Mon May 16 10:29:39 2016 +0100

    SSPCPP-689 Move up to VC14: timezone no longer exists
    
    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 | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/odbc-store/odbc-store.cpp b/odbc-store/odbc-store.cpp
index 1ad49a2..7f5fa2f 100644
--- a/odbc-store/odbc-store.cpp
+++ b/odbc-store/odbc-store.cpp
@@ -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

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-shibboleth/shibboleth-sp2.git