diff options
| author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2013-07-01 13:42:19 +0000 |
|---|---|---|
| committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2013-07-01 13:42:19 +0000 |
| commit | 3d887290087ac01c8dddf9422088e5e2a26798da (patch) | |
| tree | 0a9640f5ecb6c276330573884af410a70f2b8d6e /Build | |
| parent | 6dbfce345ce1137d12b8bd2179d4ab634a8c7c07 (diff) | |
LuaTeX: MSVC build fix from Akira
git-svn-id: svn://tug.org/texlive/trunk@31057 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
| -rw-r--r-- | Build/source/texk/web2c/luatexdir/ChangeLog | 5 | ||||
| -rw-r--r-- | Build/source/texk/web2c/luatexdir/luatex.c | 15 | ||||
| -rw-r--r-- | Build/source/texk/web2c/luatexdir/ptexlib.h | 2 |
3 files changed, 9 insertions, 13 deletions
diff --git a/Build/source/texk/web2c/luatexdir/ChangeLog b/Build/source/texk/web2c/luatexdir/ChangeLog index 0e5fd298c6d..dae4997ed5d 100644 --- a/Build/source/texk/web2c/luatexdir/ChangeLog +++ b/Build/source/texk/web2c/luatexdir/ChangeLog @@ -1,3 +1,8 @@ +2013-07-01 Akira Kakuto <kakuto@fuk.kindai.ac.jp> + + * luatex.c, ptexlib.h: Revert the previous change. + * luatex.c [MSVC]: Undef timezone before including <time.h>. + 2013-06-28 Akira Kakuto <kakuto@fuk.kindai.ac.jp> * luatex.c, ptexlib.h: Slightly modify because Visual Studio cannot diff --git a/Build/source/texk/web2c/luatexdir/luatex.c b/Build/source/texk/web2c/luatexdir/luatex.c index 120f05dd0bd..d057b1830b9 100644 --- a/Build/source/texk/web2c/luatexdir/luatex.c +++ b/Build/source/texk/web2c/luatexdir/luatex.c @@ -9,15 +9,6 @@ changed to include texd.h or mfd.h. The ?d.h file is what #defines TeX or MF, which avoids the need for a special Makefile rule. */ -#ifdef _MSC_VER -#define LUATEXC_MAIN -#include <time.h> /* For `struct tm'. */ -#if defined (HAVE_SYS_TIME_H) -# include <sys/time.h> -#elif defined (HAVE_SYS_TIMEB_H) -# include <sys/timeb.h> -#endif -#endif #include "ptexlib.h" #include "luatex.h" @@ -46,14 +37,16 @@ const char *engine_name = "luatex"; /* the name of this engine */ #include <kpathsea/concatn.h> #endif -#ifndef _MSC_VER +#ifdef _MSC_VER +#undef timezone +#endif + #include <time.h> /* For `struct tm'. */ #if defined (HAVE_SYS_TIME_H) # include <sys/time.h> #elif defined (HAVE_SYS_TIMEB_H) # include <sys/timeb.h> #endif -#endif #if defined(__STDC__) # include <locale.h> diff --git a/Build/source/texk/web2c/luatexdir/ptexlib.h b/Build/source/texk/web2c/luatexdir/ptexlib.h index f1fd0898f27..f313e6c03e1 100644 --- a/Build/source/texk/web2c/luatexdir/ptexlib.h +++ b/Build/source/texk/web2c/luatexdir/ptexlib.h @@ -24,13 +24,11 @@ # define PTEXLIB_H /* Try to detect if a system header has already been included. */ -#ifndef LUATEXC_MAIN #if (defined(__linux__) && defined(_FEATURES_H)) || \ (defined(_MSC_VER) && (defined(_INC_CRTDEFS) || defined(_OFF_T_DEFINED))) || \ (defined(__MINGW32__) && defined(__MINGW_H)) ptexlib.h must be included first!!! #endif -#endif #ifdef HAVE_CONFIG_H #include <w2c/config.h> |