summaryrefslogtreecommitdiff
path: root/Build/source/texk
diff options
context:
space:
mode:
authorAkira Kakuto <kakuto@fuk.kindai.ac.jp>2013-07-02 13:16:54 +0000
committerAkira Kakuto <kakuto@fuk.kindai.ac.jp>2013-07-02 13:16:54 +0000
commit09b4b412a3fcdfee5bc8414b559f0396c66d14a3 (patch)
treea8a017083dd10f85e1959bdda634f4137c6e51c1 /Build/source/texk
parent3778428430472de826ba9176ffb0dd749508d0aa (diff)
undef timezone before reading time.h for MSVC.
git-svn-id: svn://tug.org/texlive/trunk@31069 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk')
-rw-r--r--Build/source/texk/web2c/xetexdir/ChangeLog4
-rw-r--r--Build/source/texk/web2c/xetexdir/XeTeX_ext.c4
2 files changed, 8 insertions, 0 deletions
diff --git a/Build/source/texk/web2c/xetexdir/ChangeLog b/Build/source/texk/web2c/xetexdir/ChangeLog
index eac4522fd31..743277c9dac 100644
--- a/Build/source/texk/web2c/xetexdir/ChangeLog
+++ b/Build/source/texk/web2c/xetexdir/ChangeLog
@@ -1,3 +1,7 @@
+2013-07-02 Akira Kakuto <kakuto@fuk.kindai.ac.jp>
+
+ * XeTeX_ext.c: Undefine timezone before reading time.h for MSVC.
+
2013-07-02 Peter Breitenlohner <peb@mppmu.mpg.de>
* XeTeXFontInst.cpp, XeTeXFontInst_Mac.cpp, XeTeXFontMgr.cpp,
diff --git a/Build/source/texk/web2c/xetexdir/XeTeX_ext.c b/Build/source/texk/web2c/xetexdir/XeTeX_ext.c
index 242e7a644d5..de6ef753e26 100644
--- a/Build/source/texk/web2c/xetexdir/XeTeX_ext.c
+++ b/Build/source/texk/web2c/xetexdir/XeTeX_ext.c
@@ -45,6 +45,10 @@ authorization from the copyright holders.
#include "zlib.h"
+#ifdef _MSC_VER
+#undef timezone
+#endif
+
#include <time.h> /* For `struct tm'. */
#if defined (HAVE_SYS_TIME_H)
#include <sys/time.h>