diff options
Diffstat (limited to 'lauxlib.h')
-rw-r--r-- | lauxlib.h | 9 |
1 files changed, 3 insertions, 6 deletions
@@ -12,6 +12,7 @@ | |||
12 | #include <stddef.h> | 12 | #include <stddef.h> |
13 | #include <stdio.h> | 13 | #include <stdio.h> |
14 | 14 | ||
15 | #include "luaconf.h" | ||
15 | #include "lua.h" | 16 | #include "lua.h" |
16 | 17 | ||
17 | 18 | ||
@@ -122,10 +123,6 @@ LUALIB_API void (luaL_requiref) (lua_State *L, const char *modname, | |||
122 | ** =============================================================== | 123 | ** =============================================================== |
123 | */ | 124 | */ |
124 | 125 | ||
125 | #if !defined(l_likely) | ||
126 | #define l_likely(x) x | ||
127 | #endif | ||
128 | |||
129 | 126 | ||
130 | #define luaL_newlibtable(L,l) \ | 127 | #define luaL_newlibtable(L,l) \ |
131 | lua_createtable(L, 0, sizeof(l)/sizeof((l)[0]) - 1) | 128 | lua_createtable(L, 0, sizeof(l)/sizeof((l)[0]) - 1) |
@@ -134,10 +131,10 @@ LUALIB_API void (luaL_requiref) (lua_State *L, const char *modname, | |||
134 | (luaL_checkversion(L), luaL_newlibtable(L,l), luaL_setfuncs(L,l,0)) | 131 | (luaL_checkversion(L), luaL_newlibtable(L,l), luaL_setfuncs(L,l,0)) |
135 | 132 | ||
136 | #define luaL_argcheck(L, cond,arg,extramsg) \ | 133 | #define luaL_argcheck(L, cond,arg,extramsg) \ |
137 | ((void)(l_likely(cond) || luaL_argerror(L, (arg), (extramsg)))) | 134 | ((void)(luai_likely(cond) || luaL_argerror(L, (arg), (extramsg)))) |
138 | 135 | ||
139 | #define luaL_argexpected(L,cond,arg,tname) \ | 136 | #define luaL_argexpected(L,cond,arg,tname) \ |
140 | ((void)(l_likely(cond) || luaL_typeerror(L, (arg), (tname)))) | 137 | ((void)(luai_likely(cond) || luaL_typeerror(L, (arg), (tname)))) |
141 | 138 | ||
142 | #define luaL_checkstring(L,n) (luaL_checklstring(L, (n), NULL)) | 139 | #define luaL_checkstring(L,n) (luaL_checklstring(L, (n), NULL)) |
143 | #define luaL_optstring(L,n,d) (luaL_optlstring(L, (n), (d), NULL)) | 140 | #define luaL_optstring(L,n,d) (luaL_optlstring(L, (n), (d), NULL)) |