projects
/
shibboleth
/
cpp-sp.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
28e966b
)
SSPCPP-689 Move up to VC14: timezone no longer exists
author
Rod Widdowson
<rdw@steadingsoftware.com>
Mon, 16 May 2016 09:29:39 +0000
(10:29 +0100)
committer
Rod 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
patch
|
blob
|
history
diff --git
a/odbc-store/odbc-store.cpp
b/odbc-store/odbc-store.cpp
index
1ad49a2
..
7f5fa2f
100644
(file)
--- 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