diff options
| author | David Ostrovsky <david@ostrovsky.org> | 2015-07-27 08:15:10 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2015-07-28 20:19:35 +0000 |
| commit | fb8d066368ffbbb1909a6d0b402c09248569c62e (patch) | |
| tree | 9d3254d1b46692f8df5fc97e09c74410c0b52ed0 /stoc | |
| parent | 09bd5846d57bf6b506b0967d664b2f80562e03fc (diff) | |
stoc: tzname is _tzname on MSVC 14.0
Change-Id: I899ed85dc86edceb83b262643f83d87edd4ba905
Reviewed-on: https://gerrit.libreoffice.org/17361
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'stoc')
| -rw-r--r-- | stoc/source/javavm/javavm.cxx | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/stoc/source/javavm/javavm.cxx b/stoc/source/javavm/javavm.cxx index 46571c113fb6..8e20fc2d8050 100644 --- a/stoc/source/javavm/javavm.cxx +++ b/stoc/source/javavm/javavm.cxx @@ -484,6 +484,9 @@ static void setTimeZone(stoc_javavm::JVM * pjvm) throw() { tmData = localtime(&clock); #ifdef MACOSX char * p = tmData->tm_zone; +#elif defined(_MSC_VER) && _MSC_VER >= 1900 + char * p = _tzname[0]; + (void)tmData; #else char * p = tzname[0]; (void)tmData; |