[Libreoffice-commits] core.git: stoc/source

[David Ostrovsky]

 stoc/source/javavm/javavm.cxx |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit fb8d066368ffbbb1909a6d0b402c09248569c62e
Author: David Ostrovsky <david at ostrovsky.org>
Date:   Mon Jul 27 08:15:10 2015 +0200

    stoc: tzname is _tzname on MSVC 14.0
    
    Change-Id: I899ed85dc86edceb83b262643f83d87edd4ba905
    Reviewed-on: https://gerrit.libreoffice.org/17361
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Michael Stahl <mstahl at redhat.com>
    Tested-by: Michael Stahl <mstahl at redhat.com>

diff --git a/stoc/source/javavm/javavm.cxx b/stoc/source/javavm/javavm.cxx
index 46571c1..8e20fc2 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;