diff options
| author | Luigi Scarso <luigi.scarso@gmail.com> | 2019-03-12 22:40:01 +0000 |
|---|---|---|
| committer | Luigi Scarso <luigi.scarso@gmail.com> | 2019-03-12 22:40:01 +0000 |
| commit | c8e74f2631bcd42d6864d6e586522e8e00c6131a (patch) | |
| tree | c5a83c9c4f72c083e9a327b5118b1c9fc2a21478 /Build/source/texk | |
| parent | d2c88b0adcffe4848811472d10c7f4758cdd5ef7 (diff) | |
Sync with luatex rev. 7114
git-svn-id: svn://tug.org/texlive/trunk@50359 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk')
4 files changed, 3 insertions, 5 deletions
diff --git a/Build/source/texk/web2c/luatexdir/lua/luastuff.c b/Build/source/texk/web2c/luatexdir/lua/luastuff.c index 0d9342223df..cf2b1684431 100644 --- a/Build/source/texk/web2c/luatexdir/lua/luastuff.c +++ b/Build/source/texk/web2c/luatexdir/lua/luastuff.c @@ -346,9 +346,7 @@ void luainterpreter(void) /*tex preload the pure \LUA\ modules */ luatex_socketlua_open(L); } - /*tex |zlib|'s slightly odd calling convention */ luaopen_zlib(L); - lua_setglobal(L, "zlib"); luaopen_gzip(L); /*tex our own libraries register themselves */ luaopen_fio(L); diff --git a/Build/source/texk/web2c/luatexdir/luatex_svnversion.h b/Build/source/texk/web2c/luatexdir/luatex_svnversion.h index b44d044ecb2..df3f66dae7f 100644 --- a/Build/source/texk/web2c/luatexdir/luatex_svnversion.h +++ b/Build/source/texk/web2c/luatexdir/luatex_svnversion.h @@ -1 +1 @@ -#define luatex_svn_revision 7110 +#define luatex_svn_revision 7112 diff --git a/Build/source/texk/web2c/luatexdir/luazlib/lzlib.c b/Build/source/texk/web2c/luatexdir/luazlib/lzlib.c index 2f6f269180e..e61f92d580e 100644 --- a/Build/source/texk/web2c/luatexdir/luazlib/lzlib.c +++ b/Build/source/texk/web2c/luatexdir/luazlib/lzlib.c @@ -569,7 +569,7 @@ LUALIB_API int luaopen_zlib(lua_State *L) ** Stack: */ lua_newtable(L); - luaL_openlib(L, NULL, zlib, 0); + luaL_openlib(L, "zlib", zlib, 1); /* ** Stack: zlib table diff --git a/Build/source/texk/web2c/luatexdir/luazlib/test_zlib.lua b/Build/source/texk/web2c/luatexdir/luazlib/test_zlib.lua index 9368b6aef8e..e5a18da8175 100644 --- a/Build/source/texk/web2c/luatexdir/luazlib/test_zlib.lua +++ b/Build/source/texk/web2c/luatexdir/luazlib/test_zlib.lua @@ -54,7 +54,7 @@ print('updated crc: '..crc) line(' deflate/inflate') local us -f = io.open('lzlib.c') -- f = io.open('../all.tar') +f = io.open('test_zlib.lua') -- f = io.open('../all.tar') us = f:read('*a') f:close() |