Skip to content

Commit 53d3772

Browse files
committed
fixup! Adapt NFLua states management to Lunatik
1 parent 2565e6f commit 53d3772

File tree

3 files changed

+15
-15
lines changed

3 files changed

+15
-15
lines changed

Makefile

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -28,19 +28,19 @@ endif
2828
obj-$(CONFIG_LUNATIK) += lunatik.o
2929

3030
lua-objs = lua/lapi.o lua/lcode.o lua/lctype.o lua/ldebug.o lua/ldo.o \
31-
lua/ldump.o lua/lfunc.o lua/lgc.o lua/llex.o lua/lmem.o \
32-
lua/lobject.o lua/lopcodes.o lua/lparser.o lua/lstate.o \
33-
lua/lstring.o lua/ltable.o lua/ltm.o \
34-
lua/lundump.o lua/lvm.o lua/lzio.o lua/lauxlib.o lua/lbaselib.o \
35-
lua/lbitlib.o lua/lcorolib.o lua/ldblib.o lua/lstrlib.o \
36-
lua/ltablib.o lua/lutf8lib.o lua/loslib.o lua/lmathlib.o lua/linit.o \
37-
lua/loadlib.o luautil.o
31+
lua/ldump.o lua/lfunc.o lua/lgc.o lua/llex.o lua/lmem.o \
32+
lua/lobject.o lua/lopcodes.o lua/lparser.o lua/lstate.o \
33+
lua/lstring.o lua/ltable.o lua/ltm.o \
34+
lua/lundump.o lua/lvm.o lua/lzio.o lua/lauxlib.o lua/lbaselib.o \
35+
lua/lbitlib.o lua/lcorolib.o lua/ldblib.o lua/lstrlib.o \
36+
lua/ltablib.o lua/lutf8lib.o lua/loslib.o lua/lmathlib.o lua/linit.o \
37+
lua/loadlib.o luautil.o
3838

3939
lua_memory-objs = deps/lua-memory/src/lmemlib.o deps/lua-memory/src/lmemmod.o
4040

4141
lunatik-objs += $(lua-objs) \
42-
arch/$(ARCH)/setjmp.o util/modti3.o lunatik_core.o states.o netlink.o $(lua_memory-objs) \
43-
luanetlink.o
42+
arch/$(ARCH)/setjmp.o util/modti3.o lunatik_core.o states.o netlink.o $(lua_memory-objs) \
43+
luanetlink.o
4444

4545
ifeq ($(shell [ "${VERSION}" -lt "4" ] && [ "${VERSION}${PATCHLEVEL}" -lt "312" ] && echo y),y)
4646
lunatik-objs += util/div64.o

lunatik_conf.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,14 @@
2020
#ifndef LUNATIK_CONF_H
2121
#define LUNATIK_CONF_H
2222

23-
#define LUNATIK_NAME_MAXSIZE 64 /* Max length of Lua state name */
23+
#define LUNATIK_NAME_MAXSIZE (64) /* Max length of Lua state name */
2424

25-
#define LUNATIK_SCRIPTNAME_MAXSIZE 255 /* Max length of script name */
25+
#define LUNATIK_SCRIPTNAME_MAXSIZE (255) /* Max length of script name */
2626

27-
#define LUNATIK_DEFAULT_NS get_net_ns_by_pid(1)
27+
#define LUNATIK_DEFAULT_NS (get_net_ns_by_pid(1))
2828

29-
#define LUNATIK_MIN_ALLOC_BYTES (32 * 1024UL)
29+
#define LUNATIK_MIN_ALLOC_BYTES (32 * 1024UL)
3030

31-
#define LUNATIK_HASH_BUCKETS 32
31+
#define LUNATIK_HASH_BUCKETS (32)
3232

3333
#endif /* LUNATIK_CONF_H */

states.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
#include "lunatik.h"
3232

3333
#ifndef LUNATIK_SETPAUSE
34-
#define LUNATIK_SETPAUSE 100
34+
#define LUNATIK_SETPAUSE (100)
3535
#endif /* LUNATIK_SETPAUSE */
3636

3737
extern int luaopen_memory(lua_State *);

0 commit comments

Comments
 (0)