summaryrefslogtreecommitdiff
path: root/fpdfsdk/src/jsapi
diff options
context:
space:
mode:
authorBruce Dawson <brucedawson@google.com>2015-04-09 09:36:34 -0700
committerBruce Dawson <brucedawson@google.com>2015-04-09 09:36:34 -0700
commitcbcc7305fd8d0d0fbed316ed092642de10c3b207 (patch)
treeec84fefd60b16e13bfc4dfae5c16cd71fb7086cc /fpdfsdk/src/jsapi
parent45a3d338e60a7ae8c58bd2f3122ef4da01c4e051 (diff)
downloadpdfium-cbcc7305fd8d0d0fbed316ed092642de10c3b207.tar.xz
Fix reference to timezone variable - removed in VS 2015
It turns out that 'timezone' has been deprecated for a while. If deprecation messages are enabled then VS 2013 says this when 'timezone' is referenced: warning C4996: 'timezone': This function or variable may be unsafe. Consider using _get_timezone instead. Sometimes features stay deprecated for decades, but in this case 'timezone' is now gone. R=tsepez@chromium.org BUG=440500 Review URL: https://codereview.chromium.org/1075673002
Diffstat (limited to 'fpdfsdk/src/jsapi')
-rw-r--r--fpdfsdk/src/jsapi/fxjs_v8.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/fpdfsdk/src/jsapi/fxjs_v8.cpp b/fpdfsdk/src/jsapi/fxjs_v8.cpp
index edade5fb94..1fb2a0882f 100644
--- a/fpdfsdk/src/jsapi/fxjs_v8.cpp
+++ b/fpdfsdk/src/jsapi/fxjs_v8.cpp
@@ -758,6 +758,13 @@ double _getLocalTZA()
time_t t = 0;
time(&t);
localtime(&t);
+#if _MSC_VER >= 1900
+ // In gcc and in Visual Studio prior to VS 2015 'timezone' is a global
+ // variable declared in time.h. That variable was deprecated and in VS 2015
+ // is removed, with _get_timezone replacing it.
+ long timezone = 0;
+ _get_timezone(&timezone);
+#endif
return (double)(-(timezone * 1000));
}