summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLua Team <team@lua.org>2011-11-25 12:00:00 +0000
committerrepogen <>2011-11-25 12:00:00 +0000
commitdfa489618335f21b74e1b2040a64b28dcbe048a6 (patch)
tree0773b8d0b6f56011b3a63349e701e077b2d2181c
parent2e5ae8240bb2daf5d66d69e199de10dde62f5d13 (diff)
downloadlua-github-dfa489618335f21b74e1b2040a64b28dcbe048a6.tar.gz
Lua 5.2.0-rc25.2.0-rc2
-rw-r--r--doc/manual.html8
-rw-r--r--src/liolib.c6
-rw-r--r--src/loadlib.c4
-rw-r--r--src/luaconf.h4
4 files changed, 12 insertions, 10 deletions
diff --git a/doc/manual.html b/doc/manual.html
index 9e16e6b0..8b3a85e5 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -33,7 +33,7 @@ Freely available under the terms of the
<!-- ====================================================================== -->
<p>
-<!-- $Id: manual.of,v 1.88 2011/11/24 13:23:53 roberto Exp $ -->
+<!-- $Id: manual.of,v 1.89 2011/11/25 12:59:54 roberto Exp $ -->
@@ -8020,8 +8020,8 @@ with length <code>i</code>.
<p>
If, after the translation of negative indices,
-<code>i</code> is less than zero,
-it is corrected to zero.
+<code>i</code> is less than 1,
+it is corrected to 1.
If <code>j</code> is greater than the string length,
it is corrected to that length.
If, after these corrections,
@@ -10352,7 +10352,7 @@ Here is the complete syntax of Lua in extended BNF.
<HR>
<SMALL CLASS="footer">
Last update:
-Thu Nov 24 11:54:31 BRST 2011
+Fri Nov 25 11:37:49 BRST 2011
</SMALL>
<!--
Last change: revised for Lua 5.2.0
diff --git a/src/liolib.c b/src/liolib.c
index 0c9314c7..4814aa2c 100644
--- a/src/liolib.c
+++ b/src/liolib.c
@@ -1,5 +1,5 @@
/*
-** $Id: liolib.c,v 2.107 2011/11/14 16:55:35 roberto Exp $
+** $Id: liolib.c,v 2.108 2011/11/25 12:50:03 roberto Exp $
** Standard I/O (and system) library
** See Copyright Notice in lua.h
*/
@@ -78,7 +78,9 @@
#define l_ftell(f) ftello(f)
#define l_seeknum off_t
-#elif defined(LUA_WIN)
+#elif defined(LUA_WIN) && !defined(_CRTIMP_TYPEINFO) \
+ && defined(_MSC_VER) && (_MSC_VER >= 1400)
+/* Windows (but not DDK) and Visual C++ 2005 or higher */
#define l_fseek(f,o,w) _fseeki64(f,o,w)
#define l_ftell(f) _ftelli64(f)
diff --git a/src/loadlib.c b/src/loadlib.c
index acf5af6b..28fda6e5 100644
--- a/src/loadlib.c
+++ b/src/loadlib.c
@@ -1,5 +1,5 @@
/*
-** $Id: loadlib.c,v 1.104 2011/11/10 11:42:58 roberto Exp $
+** $Id: loadlib.c,v 1.105 2011/11/25 12:52:03 roberto Exp $
** Dynamic library loader for Lua
** See Copyright Notice in lua.h
**
@@ -12,7 +12,7 @@
/*
** if needed, includes windows header before everything else
*/
-#if defined(LUA_DL_DLL)
+#if defined(_WIN32)
#include <windows.h>
#endif
diff --git a/src/luaconf.h b/src/luaconf.h
index a5d62470..5cdb7b7b 100644
--- a/src/luaconf.h
+++ b/src/luaconf.h
@@ -1,5 +1,5 @@
/*
-** $Id: luaconf.h,v 1.166 2011/11/09 14:47:14 roberto Exp $
+** $Id: luaconf.h,v 1.167 2011/11/25 12:52:27 roberto Exp $
** Configuration file for Lua
** See Copyright Notice in lua.h
*/
@@ -463,7 +463,7 @@
/* On a Microsoft compiler on a Pentium, use assembler to avoid clashes
with a DirectX idiosyncrasy */
-#if defined(LUA_WIN) && defined(_M_IX86) /* { */
+#if defined(LUA_WIN) && defined(_MSC_VER) && defined(_M_IX86) /* { */
#define MS_ASMTRICK