mirror of
https://github.com/cloudwu/skynet.git
synced 2026-07-25 04:33:05 +00:00
update lua 5.5.1
This commit is contained in:
@@ -70,14 +70,16 @@
|
||||
#if defined(LUA_USE_LINUX)
|
||||
#define LUA_USE_POSIX
|
||||
#define LUA_USE_DLOPEN /* needs an extra library: -ldl */
|
||||
#if !defined(LUA_READLINELIB)
|
||||
#define LUA_READLINELIB "libreadline.so"
|
||||
#endif
|
||||
#endif
|
||||
|
||||
|
||||
#if defined(LUA_USE_MACOSX)
|
||||
#define LUA_USE_POSIX
|
||||
#define LUA_USE_DLOPEN /* macOS does not need -ldl */
|
||||
#define LUA_READLINELIB "libedit.dylib"
|
||||
#define LUA_USE_READLINE
|
||||
#endif
|
||||
|
||||
|
||||
@@ -224,17 +226,17 @@
|
||||
|
||||
#if !defined(LUA_PATH_DEFAULT)
|
||||
#define LUA_PATH_DEFAULT \
|
||||
LUA_LDIR"?.lua;" LUA_LDIR"?\\init.lua;" \
|
||||
LUA_CDIR"?.lua;" LUA_CDIR"?\\init.lua;" \
|
||||
LUA_SHRDIR"?.lua;" LUA_SHRDIR"?\\init.lua;" \
|
||||
LUA_LDIR "?.lua;" LUA_LDIR "?\\init.lua;" \
|
||||
LUA_CDIR "?.lua;" LUA_CDIR "?\\init.lua;" \
|
||||
LUA_SHRDIR "?.lua;" LUA_SHRDIR "?\\init.lua;" \
|
||||
".\\?.lua;" ".\\?\\init.lua"
|
||||
#endif
|
||||
|
||||
#if !defined(LUA_CPATH_DEFAULT)
|
||||
#define LUA_CPATH_DEFAULT \
|
||||
LUA_CDIR"?.dll;" \
|
||||
LUA_CDIR"..\\lib\\lua\\" LUA_VDIR "\\?.dll;" \
|
||||
LUA_CDIR"loadall.dll;" ".\\?.dll"
|
||||
LUA_CDIR "?.dll;" \
|
||||
LUA_CDIR "..\\lib\\lua\\" LUA_VDIR "\\?.dll;" \
|
||||
LUA_CDIR "loadall.dll;" ".\\?.dll"
|
||||
#endif
|
||||
|
||||
#else /* }{ */
|
||||
@@ -245,14 +247,14 @@
|
||||
|
||||
#if !defined(LUA_PATH_DEFAULT)
|
||||
#define LUA_PATH_DEFAULT \
|
||||
LUA_LDIR"?.lua;" LUA_LDIR"?/init.lua;" \
|
||||
LUA_CDIR"?.lua;" LUA_CDIR"?/init.lua;" \
|
||||
LUA_LDIR "?.lua;" LUA_LDIR "?/init.lua;" \
|
||||
LUA_CDIR "?.lua;" LUA_CDIR "?/init.lua;" \
|
||||
"./?.lua;" "./?/init.lua"
|
||||
#endif
|
||||
|
||||
#if !defined(LUA_CPATH_DEFAULT)
|
||||
#define LUA_CPATH_DEFAULT \
|
||||
LUA_CDIR"?.so;" LUA_CDIR"loadall.so;" "./?.so"
|
||||
LUA_CDIR "?.so;" LUA_CDIR "loadall.so;" "./?.so"
|
||||
#endif
|
||||
|
||||
#endif /* } */
|
||||
@@ -339,7 +341,9 @@
|
||||
/*
|
||||
@@ LUA_COMPAT_GLOBAL avoids 'global' being a reserved word
|
||||
*/
|
||||
#define LUA_COMPAT_GLOBAL
|
||||
#if !defined(LUA_COMPAT_GLOBAL)
|
||||
#define LUA_COMPAT_GLOBAL 1
|
||||
#endif
|
||||
|
||||
|
||||
/*
|
||||
@@ -649,7 +653,7 @@
|
||||
*/
|
||||
#if !defined(luai_likely)
|
||||
|
||||
#if defined(__GNUC__) && !defined(LUA_NOBUILTIN)
|
||||
#if !defined(LUA_NOBUILTIN) && defined(__GNUC__) && (__GNUC__ >= 3)
|
||||
#define luai_likely(x) (__builtin_expect(((x) != 0), 1))
|
||||
#define luai_unlikely(x) (__builtin_expect(((x) != 0), 0))
|
||||
#else
|
||||
@@ -721,10 +725,17 @@
|
||||
|
||||
|
||||
/*
|
||||
@@ LUAI_MAXALIGN defines fields that, when used in a union, ensure
|
||||
** maximum alignment for the other items in that union.
|
||||
@@ LUAI_MAXALIGN defines fields that ensure proper alignment for
|
||||
** memory areas offered by Lua (e.g., userdata memory).
|
||||
** Add fields to it if you need alignment for non-ISO objects.
|
||||
*/
|
||||
#if defined(LLONG_MAX)
|
||||
/* use ISO C99 stuff */
|
||||
#define LUAI_MAXALIGN long double u; void *s; long long l
|
||||
#else
|
||||
/* use only C89 stuff */
|
||||
#define LUAI_MAXALIGN lua_Number n; double u; void *s; lua_Integer i; long l
|
||||
#endif
|
||||
|
||||
/* }================================================================== */
|
||||
|
||||
|
||||
Reference in New Issue
Block a user