summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2014-02-03 13:45:49 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2014-02-03 13:45:49 +0000
commit9c990b20d0bfa87768186c40adc05158b6ce30d0 (patch)
treea22bc99701c7226fe6ecbdfbf1eddb7efbbc510b
parent4dc568b1e2c01476f34b6c014da3bc487b71aacf (diff)
LuaTeX: Avoid MinGW warnings
git-svn-id: svn://tug.org/texlive/trunk@32855 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Build/source/texk/web2c/luatexdir/ChangeLog2
-rw-r--r--Build/source/texk/web2c/luatexdir/lua/liolibext.c13
2 files changed, 8 insertions, 7 deletions
diff --git a/Build/source/texk/web2c/luatexdir/ChangeLog b/Build/source/texk/web2c/luatexdir/ChangeLog
index 64708ab3484..9b03742576d 100644
--- a/Build/source/texk/web2c/luatexdir/ChangeLog
+++ b/Build/source/texk/web2c/luatexdir/ChangeLog
@@ -5,6 +5,8 @@
* luatexfont.h: Keep the prototype for auto_expand_font() as
long as the function remains in vfovf.w.
+ * liolibext.c [__MINGW32__]: Don't redefine l_fseek etc.
+
2014-02-01 Peter Breitenlohner <peb@mppmu.mpg.de>
* am/libluatex.am, am/luafontforge.am, am/luamisc.am,
diff --git a/Build/source/texk/web2c/luatexdir/lua/liolibext.c b/Build/source/texk/web2c/luatexdir/lua/liolibext.c
index 27facfedeec..80ca4955a60 100644
--- a/Build/source/texk/web2c/luatexdir/lua/liolibext.c
+++ b/Build/source/texk/web2c/luatexdir/lua/liolibext.c
@@ -78,6 +78,12 @@ static const char _svn_version[] =
#define l_ftell(f) _ftelli64(f)
#define l_seeknum __int64
+#elif defined(__MINGW32__)
+
+#define l_fseek(f,o,w) fseeko64(f,o,w)
+#define l_ftell(f) ftello64(f)
+#define l_seeknum int64_t
+
#else
#define l_fseek(f,o,w) fseek(f,o,w)
@@ -86,13 +92,6 @@ static const char _svn_version[] =
#endif
-/* Large File Support under Windows 32bit Windows 64 bit */
-#if defined(__MINGW32__)
-#define l_fseek(f,o,w) fseeko64(f,o,w)
-#define l_ftell(f) ftello64(f)
-#define l_seeknum int64_t
-#endif
-
#define IO_PREFIX "_IO_"
#define IO_INPUT (IO_PREFIX "input")
#define IO_OUTPUT (IO_PREFIX "output")