Commit c0f44d25 authored by Kelly Anderson's avatar Kelly Anderson Committed by Rémi Denis-Courmont

Consolidate lua includes in vlc.h

So lua 5.2 compatibility declarations can be made in one place.
Signed-off-by: Rémi Denis-Courmont's avatarRémi Denis-Courmont <remi@remlab.net>
parent a9571144
......@@ -37,10 +37,6 @@
#include <sys/types.h>
#include <sys/stat.h>
#include <lua.h> /* Low level lua C API */
#include <lauxlib.h> /* Higher level C API */
#include <lualib.h> /* Lua libs */
#include "vlc.h"
#include "libs.h"
......
......@@ -35,9 +35,6 @@
#include <vlc_common.h>
#include <vlc_acl.h>
#include <lua.h> /* Low level lua C API */
#include <lauxlib.h> /* Higher level C API */
#include "../vlc.h"
#include "../libs.h"
......
......@@ -34,9 +34,6 @@
#include <vlc_common.h>
#include <lua.h> /* Low level lua C API */
#include <lauxlib.h> /* Higher level C API */
#include "../vlc.h"
#include "../libs.h"
......
......@@ -35,9 +35,6 @@
#include <vlc_common.h>
#include <vlc_extensions.h>
#include <lua.h> /* Low level lua C API */
#include <lauxlib.h> /* Higher level C API */
#include "../vlc.h"
#include "../libs.h"
......
......@@ -38,9 +38,6 @@
#include <vlc_input.h>
#include <vlc_charset.h>
#include <lua.h> /* Low level lua C API */
#include <lauxlib.h> /* Higher level C API */
#include "input.h"
#include "../libs.h"
#include "../vlc.h"
......
......@@ -32,10 +32,6 @@
# include "config.h"
#endif
#include <lua.h> /* Low level lua C API */
#include <lauxlib.h> /* Higher level C API */
#include <lualib.h> /* Lua libs */
#include "../vlc.h"
#include "../libs.h"
......
......@@ -35,10 +35,6 @@
#include <vlc_common.h>
#include <vlc_httpd.h>
#include <lua.h> /* Low level lua C API */
#include <lauxlib.h> /* Higher level C API */
#include <lualib.h> /* Lua libs */
#include "../vlc.h"
#include "../libs.h"
......
......@@ -37,13 +37,11 @@
#include <vlc_playlist.h>
#include <lua.h> /* Low level lua C API */
#include <lauxlib.h> /* Higher level C API */
#include <assert.h>
#include "../vlc.h"
#include "input.h"
#include "playlist.h"
#include "../vlc.h"
#include "../libs.h"
#include "../extension.h"
......
......@@ -24,6 +24,8 @@
#ifndef VLC_LUA_INPUT_H
#define VLC_LUA_INPUT_H
#include "../vlc.h"
input_thread_t * vlclua_get_input_internal( lua_State * );
#endif
......@@ -38,10 +38,6 @@
#include <vlc_meta.h>
#include <vlc_aout.h>
#include <lua.h> /* Low level lua C API */
#include <lauxlib.h> /* Higher level C API */
#include <lualib.h> /* Lua libs */
#include "../vlc.h"
#include "../libs.h"
......
......@@ -41,10 +41,6 @@
#include <vlc_interface.h>
#include <vlc_keys.h>
#include <lua.h> /* Low level lua C API */
#include <lauxlib.h> /* Higher level C API */
#include <lualib.h> /* Lua libs */
#include "../vlc.h"
#include "../libs.h"
......
......@@ -41,9 +41,6 @@
#include <vlc_url.h>
#include <vlc_fs.h>
#include <lua.h> /* Low level lua C API */
#include <lauxlib.h> /* Higher level C API */
#ifdef HAVE_POLL
#include <poll.h> /* poll structures and defines */
#endif
......
......@@ -35,9 +35,6 @@
#include <vlc_common.h>
#include <vlc_vout.h>
#include <lua.h> /* Low level lua C API */
#include <lauxlib.h> /* Higher level C API */
#include "../vlc.h"
#include "../libs.h"
#include "objects.h"
......
......@@ -35,9 +35,6 @@
#include <vlc_vout.h>
#include <vlc_osd.h>
#include <lua.h> /* Low level lua C API */
#include <lauxlib.h> /* Higher level C API */
#include "../vlc.h"
#include "../libs.h"
#include "input.h"
......
......@@ -37,9 +37,6 @@
#include <vlc_interface.h>
#include <vlc_playlist.h>
#include <lua.h> /* Low level lua C API */
#include <lauxlib.h> /* Higher level C API */
#include "../vlc.h"
#include "../libs.h"
#include "playlist.h"
......
......@@ -38,10 +38,6 @@
#include <vlc_playlist.h>
#include <vlc_charset.h>
#include <lua.h> /* Low level lua C API */
#include <lauxlib.h> /* Higher level C API */
#include <lualib.h> /* Lua libs */
#include "../vlc.h"
#include "../libs.h"
#include "playlist.h"
......
......@@ -38,9 +38,6 @@
#include <vlc_meta.h>
#include <vlc_aout.h>
#include <lua.h> /* Low level lua C API */
#include <lauxlib.h> /* Higher level C API */
#include "../vlc.h"
#include "../libs.h"
......
......@@ -39,9 +39,6 @@
#include <vlc_aout.h>
#include <vlc_charset.h>
#include <lua.h> /* Low level lua C API */
#include <lauxlib.h> /* Higher level C API */
#include "../vlc.h"
#include "../libs.h"
......
......@@ -34,10 +34,6 @@
#include <vlc_common.h>
#include <lua.h> /* Low level lua C API */
#include <lauxlib.h> /* Higher level C API */
#include <lualib.h> /* Lua libs */
#include "../vlc.h"
#include "../libs.h"
#include "variables.h"
......
......@@ -34,9 +34,6 @@
#include <vlc_vout.h>
#include <lua.h> /* Low level lua C API */
#include <lauxlib.h> /* Higher level C API */
#include "../vlc.h"
#include "../libs.h"
#include "input.h"
......
......@@ -35,9 +35,6 @@
#include <vlc_common.h>
#include <vlc_vlm.h>
#include <lua.h> /* Low level lua C API */
#include <lauxlib.h> /* Higher level C API */
#include "../vlc.h"
#include "../libs.h"
......
......@@ -38,10 +38,6 @@
#include <vlc_meta.h>
#include <vlc_aout_intf.h>
#include <lua.h> /* Low level lua C API */
#include <lauxlib.h> /* Higher level C API */
#include <lualib.h> /* Lua libs */
#include "../vlc.h"
#include "../libs.h"
#include "playlist.h"
......
......@@ -35,9 +35,6 @@
#include <vlc_common.h>
#include <vlc_xml.h>
#include <lua.h> /* Low level lua C API */
#include <lauxlib.h> /* Higher level C API */
#include "../vlc.h"
#include "../libs.h"
......
......@@ -45,10 +45,6 @@
#include <vlc_stream.h>
#include <sys/stat.h>
#include <lua.h> /* Low level lua C API */
#include <lauxlib.h> /* Higher level C API */
#include <lualib.h> /* Lua libs */
#include "vlc.h"
/*****************************************************************************
......
......@@ -36,9 +36,15 @@
#include <vlc_strings.h>
#include <vlc_stream.h>
#define LUA_COMPAT_MODULE
#include <lua.h> /* Low level lua C API */
#include <lauxlib.h> /* Higher level C API */
#include <lualib.h> /* Lua libs */
#if LUA_VERSION_NUM >= 502
#define lua_equal(L,idx1,idx2) lua_compare(L,(idx1),(idx2),LUA_OPEQ)
#define lua_objlen(L,idx) lua_rawlen(L,idx)
#define lua_strlen(L,idx) lua_rawlen(L,idx)
#endif
/*****************************************************************************
* Module entry points
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment