Module Name: src
Committed By: nikita
Date: Sun Apr 16 20:46:18 UTC 2023
Modified Files:
src/distrib/sets/lists/base: ad.aarch64 mi shl.mi
src/distrib/sets/lists/debug: shl.mi
src/doc: 3RDPARTY CHANGES
src/etc/mtree: NetBSD.dist.base NetBSD.dist.compat.in
src/external/mit/lua/dist: Makefile README README.import
src/external/mit/lua/dist/doc: contents.html lua.1 manual.html
readme.html
src/external/mit/lua/dist/src: Makefile lapi.c lapi.h lauxlib.c
lauxlib.h lbaselib.c lcode.c lcode.h lcorolib.c lctype.c lctype.h
ldblib.c ldebug.c ldebug.h ldo.c ldo.h ldump.c lfunc.c lfunc.h
lgc.c lgc.h linit.c liolib.c ljumptab.h llex.c llex.h llimits.h
lmathlib.c lmem.c lmem.h loadlib.c lobject.c lobject.h lopcodes.c
lopcodes.h loslib.c lparser.c lparser.h lprefix.h lstate.c lstate.h
lstring.c lstring.h lstrlib.c ltable.c ltable.h ltablib.c ltm.c
ltm.h lua.c lua.h luac.c luaconf.h lualib.h lundump.c lundump.h
lutf8lib.c lvm.c lvm.h lzio.c lzio.h
src/external/mit/lua/lib/liblua: Makefile shlib_version
src/share/mk: bsd.lua.mk
src/sys/modules/examples/luahello: luahello.lua
src/sys/modules/lua: Makefile
Removed Files:
src/external/mit/lua/dist/src: lbitlib.c
Log Message:
Resolve conflicts for lua 5.4.4 import.
Adjust various files for lua 5.4.4.
To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 src/distrib/sets/lists/base/ad.aarch64
cvs rdiff -u -r1.1314 -r1.1315 src/distrib/sets/lists/base/mi
cvs rdiff -u -r1.946 -r1.947 src/distrib/sets/lists/base/shl.mi
cvs rdiff -u -r1.303 -r1.304 src/distrib/sets/lists/debug/shl.mi
cvs rdiff -u -r1.1919 -r1.1920 src/doc/3RDPARTY
cvs rdiff -u -r1.2958 -r1.2959 src/doc/CHANGES
cvs rdiff -u -r1.246 -r1.247 src/etc/mtree/NetBSD.dist.base
cvs rdiff -u -r1.1 -r1.2 src/etc/mtree/NetBSD.dist.compat.in
cvs rdiff -u -r1.7 -r1.8 src/external/mit/lua/dist/Makefile
cvs rdiff -u -r1.8 -r1.9 src/external/mit/lua/dist/README
cvs rdiff -u -r1.2 -r1.3 src/external/mit/lua/dist/README.import
cvs rdiff -u -r1.7 -r1.8 src/external/mit/lua/dist/doc/contents.html \
src/external/mit/lua/dist/doc/lua.1 \
src/external/mit/lua/dist/doc/readme.html
cvs rdiff -u -r1.8 -r1.9 src/external/mit/lua/dist/doc/manual.html
cvs rdiff -u -r1.5 -r1.6 src/external/mit/lua/dist/src/Makefile
cvs rdiff -u -r1.12 -r1.13 src/external/mit/lua/dist/src/lapi.c \
src/external/mit/lua/dist/src/llex.c \
src/external/mit/lua/dist/src/lobject.c
cvs rdiff -u -r1.9 -r1.10 src/external/mit/lua/dist/src/lapi.h \
src/external/mit/lua/dist/src/ldebug.h \
src/external/mit/lua/dist/src/ldo.c src/external/mit/lua/dist/src/ldo.h \
src/external/mit/lua/dist/src/ldump.c \
src/external/mit/lua/dist/src/linit.c \
src/external/mit/lua/dist/src/liolib.c \
src/external/mit/lua/dist/src/lmathlib.c \
src/external/mit/lua/dist/src/lmem.c \
src/external/mit/lua/dist/src/loadlib.c \
src/external/mit/lua/dist/src/lstate.c \
src/external/mit/lua/dist/src/lstate.h \
src/external/mit/lua/dist/src/lstring.c \
src/external/mit/lua/dist/src/lstring.h \
src/external/mit/lua/dist/src/ltablib.c \
src/external/mit/lua/dist/src/ltm.c src/external/mit/lua/dist/src/lua.c
cvs rdiff -u -r1.11 -r1.12 src/external/mit/lua/dist/src/lauxlib.c \
src/external/mit/lua/dist/src/lcode.c \
src/external/mit/lua/dist/src/ldblib.c \
src/external/mit/lua/dist/src/ldebug.c \
src/external/mit/lua/dist/src/loslib.c \
src/external/mit/lua/dist/src/lparser.c \
src/external/mit/lua/dist/src/ltable.c \
src/external/mit/lua/dist/src/lua.h
cvs rdiff -u -r1.8 -r1.9 src/external/mit/lua/dist/src/lauxlib.h \
src/external/mit/lua/dist/src/lcode.h \
src/external/mit/lua/dist/src/lfunc.c \
src/external/mit/lua/dist/src/lfunc.h src/external/mit/lua/dist/src/lgc.h \
src/external/mit/lua/dist/src/llex.h src/external/mit/lua/dist/src/lmem.h \
src/external/mit/lua/dist/src/lopcodes.c \
src/external/mit/lua/dist/src/lopcodes.h \
src/external/mit/lua/dist/src/lparser.h \
src/external/mit/lua/dist/src/ltable.h \
src/external/mit/lua/dist/src/ltm.h \
src/external/mit/lua/dist/src/lundump.c \
src/external/mit/lua/dist/src/lutf8lib.c \
src/external/mit/lua/dist/src/lzio.c src/external/mit/lua/dist/src/lzio.h
cvs rdiff -u -r1.10 -r1.11 src/external/mit/lua/dist/src/lbaselib.c \
src/external/mit/lua/dist/src/lgc.c \
src/external/mit/lua/dist/src/llimits.h \
src/external/mit/lua/dist/src/lobject.h \
src/external/mit/lua/dist/src/luac.c src/external/mit/lua/dist/src/lvm.h
cvs rdiff -u -r1.7 -r0 src/external/mit/lua/dist/src/lbitlib.c
cvs rdiff -u -r1.7 -r1.8 src/external/mit/lua/dist/src/lcorolib.c \
src/external/mit/lua/dist/src/lctype.c \
src/external/mit/lua/dist/src/lctype.h \
src/external/mit/lua/dist/src/lprefix.h \
src/external/mit/lua/dist/src/lualib.h \
src/external/mit/lua/dist/src/lundump.h
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/mit/lua/dist/src/ljumptab.h
cvs rdiff -u -r1.18 -r1.19 src/external/mit/lua/dist/src/lstrlib.c
cvs rdiff -u -r1.23 -r1.24 src/external/mit/lua/dist/src/luaconf.h
cvs rdiff -u -r1.14 -r1.15 src/external/mit/lua/dist/src/lvm.c
cvs rdiff -u -r1.11 -r1.12 src/external/mit/lua/lib/liblua/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/mit/lua/lib/liblua/shlib_version
cvs rdiff -u -r1.8 -r1.9 src/share/mk/bsd.lua.mk
cvs rdiff -u -r1.2 -r1.3 src/sys/modules/examples/luahello/luahello.lua
cvs rdiff -u -r1.12 -r1.13 src/sys/modules/lua/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffs are larger than 1MB and have been omitted
