lua

commit 4422b9747253a065da560e6d24388c9fd98c6223
parent 2f02d264e987c74c1619a1d9f70efc87b2369886
Author: Roberto Ierusalimschy <roberto@inf.puc-rio.br>
Date:   Tue, 15 Apr 2014 15:25:24 -0300

keep 'luaL_checkversion_' with its signature in version 5.2, for
correct error messages in case of version mixings

Diffstat:
M
lauxlib.c
 | 
6
+++---
M
lauxlib.h
 | 
4
++--

2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/lauxlib.c b/lauxlib.c
@@ -1,5 +1,5 @@
 /*
-** $Id: lauxlib.c,v 1.260 2014/03/12 20:57:40 roberto Exp roberto $
+** $Id: lauxlib.c,v 1.261 2014/04/01 18:55:06 roberto Exp roberto $
 ** Auxiliary functions for building Lua libraries
 ** See Copyright Notice in lua.h
 */
@@ -966,12 +966,12 @@ LUALIB_API lua_State *luaL_newstate (void) {
 }
 
 
-LUALIB_API void luaL_checkversion_ (lua_State *L, int ver, size_t sz) {
+LUALIB_API void luaL_checkversion_ (lua_State *L, lua_Number ver, size_t sz) {
   const lua_Number *v = lua_version(L);
   if (v != lua_version(NULL))
     luaL_error(L, "multiple Lua VMs detected");
   else if (*v != ver)
-    luaL_error(L, "version mismatch: app. needs %d, Lua core provides %f",
+    luaL_error(L, "version mismatch: app. needs %f, Lua core provides %f",
                   ver, *v);
   /* check numeric types */
   if (sz != LUAL_NUMSIZES)
diff --git a/lauxlib.h b/lauxlib.h
@@ -1,5 +1,5 @@
 /*
-** $Id: lauxlib.h,v 1.122 2013/06/27 18:32:33 roberto Exp roberto $
+** $Id: lauxlib.h,v 1.123 2014/01/05 14:04:46 roberto Exp roberto $
 ** Auxiliary functions for building Lua libraries
 ** See Copyright Notice in lua.h
 */
@@ -28,7 +28,7 @@ typedef struct luaL_Reg {
 
 #define LUAL_NUMSIZES	(sizeof(lua_Integer)*16 + sizeof(lua_Number))
 
-LUALIB_API void (luaL_checkversion_) (lua_State *L, int ver, size_t sz);
+LUALIB_API void (luaL_checkversion_) (lua_State *L, lua_Number ver, size_t sz);
 #define luaL_checkversion(L)  \
 	  luaL_checkversion_(L, LUA_VERSION_NUM, LUAL_NUMSIZES)