summaryrefslogtreecommitdiff
path: root/src/lib/elua
diff options
context:
space:
mode:
authorDaniel Kolesa <d.kolesa@osg.samsung.com>2017-06-28 11:51:29 +0200
committerDaniel Kolesa <d.kolesa@osg.samsung.com>2017-06-28 11:51:29 +0200
commit352c044524cbc34cc083f0465544e8db95a70184 (patch)
tree849ea5db608f57d3d4eab6a780ede2b38b7da4e2 /src/lib/elua
parente65e90a6600814301d5a9c603c943c3c5d91dd8d (diff)
elua: use up to date lua API
luaL_reg is a 5.0 API which we don't support.
Diffstat (limited to 'src/lib/elua')
-rw-r--r--src/lib/elua/elua.c4
-rw-r--r--src/lib/elua/elua_private.h5
-rw-r--r--src/lib/elua/io.c2
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)
355 return 1; 355 return 1;
356}; 356};
357 357
358const luaL_reg gettextlib[] = 358const luaL_Reg gettextlib[] =
359{ 359{
360 { "bind_textdomain", _elua_gettext_bind_textdomain }, 360 { "bind_textdomain", _elua_gettext_bind_textdomain },
361 { "get_message_language", _elua_get_message_language }, 361 { "get_message_language", _elua_get_message_language },
@@ -442,7 +442,7 @@ _elua_file_rmrf(lua_State *L)
442 return 1; 442 return 1;
443} 443}
444 444
445const luaL_reg _elua_cutillib[] = 445const luaL_Reg _elua_cutillib[] =
446{ 446{
447 { "init_module", _elua_module_init }, 447 { "init_module", _elua_module_init },
448 { "popenv" , _elua_io_popen }, 448 { "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 @@
28#include <lualib.h> 28#include <lualib.h>
29#include <lauxlib.h> 29#include <lauxlib.h>
30 30
31// FIX for luajit 2.1.0-beta3: see https://phab.enlightenment.org/T2728
32#ifndef luaL_reg
33# define luaL_reg luaL_Reg
34#endif
35
36#include "Elua.h" 31#include "Elua.h"
37 32
38struct _Elua_State 33struct _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)
313 return 1; 313 return 1;
314} 314}
315 315
316static const luaL_reg elua_popenlib[] = 316static const luaL_Reg elua_popenlib[] =
317{ 317{
318 { "close" , elua_close }, 318 { "close" , elua_close },
319 { "flush" , elua_flush }, 319 { "flush" , elua_flush },