Update of /cvsroot/wxlua/wxLua/modules/lua/include
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv13456/wxLua/modules/lua/include
Modified Files:
lauxlib.h lua.h luaconf.h lualib.h
Log Message:
update lua to 5.1.1
update wxLua bindings to changes in wxWidgets CVS HEAD 2.7.0
Index: luaconf.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/lua/include/luaconf.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** luaconf.h 29 Mar 2006 05:48:11 -0000 1.1
--- luaconf.h 12 Jun 2006 03:50:37 -0000 1.2
***************
*** 61,64 ****
--- 61,76 ----
/*
+ @@ LUA_PATH and LUA_CPATH are the names of the environment variables that
+ @* Lua check to set its paths.
+ @@ LUA_INIT is the name of the environment variable that Lua
+ @* checks for initialization code.
+ ** CHANGE them if you want different names.
+ */
+ #define LUA_PATH "LUA_PATH"
+ #define LUA_CPATH "LUA_CPATH"
+ #define LUA_INIT "LUA_INIT"
+
+
+ /*
@@ LUA_PATH_DEFAULT is the default path that Lua uses to look for
@* Lua libraries.
***************
*** 544,547 ****
--- 556,570 ----
#if defined(LUA_NUMBER_DOUBLE) && !defined(LUA_ANSI) && !defined(__SSE2__) && \
(defined(__i386) || defined (_M_IX86) || defined(__i386__))
+
+ /* On a Microsoft compiler, use assembler */
+ #if defined(_MSC_VER)
+
+ #define lua_number2int(i,d) __asm fld d __asm fistp i
+ #define lua_number2integer(i,n) lua_number2int(i, n)
+
+ /* the next trick should work on any Pentium, but sometimes clashes
+ with a DirectX idiosyncrasy */
+ #else
+
union luai_Cast { double l_d; long l_l; };
#define lua_number2int(i,d) \
***************
*** 549,552 ****
--- 572,578 ----
#define lua_number2integer(i,n) lua_number2int(i, n)
+ #endif
+
+
/* this option always works, but may be slow */
#else
Index: lauxlib.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/lua/include/lauxlib.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** lauxlib.h 29 Mar 2006 05:48:11 -0000 1.2
--- lauxlib.h 12 Jun 2006 03:50:37 -0000 1.3
***************
*** 109,115 ****
#define luaL_typename(L,i) lua_typename(L, lua_type(L,(i)))
! #define luaL_dofile(L, fn) (luaL_loadfile(L, fn) || lua_pcall(L, 0, 0, 0))
! #define luaL_dostring(L, s) (luaL_loadstring(L, s) || lua_pcall(L, 0, 0, 0))
#define luaL_getmetatable(L,n) (lua_getfield(L, LUA_REGISTRYINDEX, (n)))
--- 109,117 ----
#define luaL_typename(L,i) lua_typename(L, lua_type(L,(i)))
! #define luaL_dofile(L, fn) \
! (luaL_loadfile(L, fn) || lua_pcall(L, 0, LUA_MULTRET, 0))
! #define luaL_dostring(L, s) \
! (luaL_loadstring(L, s) || lua_pcall(L, 0, LUA_MULTRET, 0))
#define luaL_getmetatable(L,n) (lua_getfield(L, LUA_REGISTRYINDEX, (n)))
Index: lua.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/lua/include/lua.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** lua.h 29 Mar 2006 05:48:11 -0000 1.2
--- lua.h 12 Jun 2006 03:50:37 -0000 1.3
***************
*** 18,21 ****
--- 18,22 ----
#define LUA_VERSION "Lua 5.1"
+ #define LUA_RELEASE "Lua 5.1.1"
#define LUA_VERSION_NUM 501
#define LUA_COPYRIGHT "Copyright (C) 1994-2006 Lua.org, PUC-Rio"
|
