From 352c044524cbc34cc083f0465544e8db95a70184 Mon Sep 17 00:00:00 2001 From: Daniel Kolesa Date: Wed, 28 Jun 2017 11:51:29 +0200 Subject: [PATCH] elua: use up to date lua API luaL_reg is a 5.0 API which we don't support. --- src/lib/elua/elua.c | 4 ++-- src/lib/elua/elua_private.h | 5 ----- src/lib/elua/io.c | 2 +- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/src/lib/elua/elua.c b/src/lib/elua/elua.c index 185f592890..2d9eebe3c3 100644 --- a/src/lib/elua/elua.c +++ b/src/lib/elua/elua.c @@ -355,7 +355,7 @@ _elua_get_localeconv(lua_State *L) return 1; }; -const luaL_reg gettextlib[] = +const luaL_Reg gettextlib[] = { { "bind_textdomain", _elua_gettext_bind_textdomain }, { "get_message_language", _elua_get_message_language }, @@ -442,7 +442,7 @@ _elua_file_rmrf(lua_State *L) return 1; } -const luaL_reg _elua_cutillib[] = +const luaL_Reg _elua_cutillib[] = { { "init_module", _elua_module_init }, { "popenv" , _elua_io_popen }, diff --git a/src/lib/elua/elua_private.h b/src/lib/elua/elua_private.h index 35c4f85641..9f62c5ff4b 100644 --- a/src/lib/elua/elua_private.h +++ b/src/lib/elua/elua_private.h @@ -28,11 +28,6 @@ #include #include -// FIX for luajit 2.1.0-beta3: see https://phab.enlightenment.org/T2728 -#ifndef luaL_reg -# define luaL_reg luaL_Reg -#endif - #include "Elua.h" struct _Elua_State diff --git a/src/lib/elua/io.c b/src/lib/elua/io.c index 6835e9936f..186170b87c 100644 --- a/src/lib/elua/io.c +++ b/src/lib/elua/io.c @@ -313,7 +313,7 @@ elua_ftostring(lua_State *L) return 1; } -static const luaL_reg elua_popenlib[] = +static const luaL_Reg elua_popenlib[] = { { "close" , elua_close }, { "flush" , elua_flush },