Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next

Origin commit data
------------------
Commit: 4b774c66ad
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-08 (Thu, 08 Sep 2016)
This commit is contained in:
vanhofen
2016-09-08 19:14:03 +02:00
3 changed files with 3 additions and 5 deletions

View File

@@ -4,4 +4,4 @@
* to luainstance.h changes
*/
#define LUA_API_VERSION_MAJOR 1
#define LUA_API_VERSION_MINOR 58
#define LUA_API_VERSION_MINOR 59

View File

@@ -383,8 +383,7 @@ int CLuaInstMisc::MiscDelete(lua_State *L)
deprecated functions
--------------------------------------------------------------- */
//#define MISC_FUNC_DEPRECATED miscFunctionDeprecated
#define MISC_FUNC_DEPRECATED(...)
#define MISC_FUNC_DEPRECATED miscFunctionDeprecated
void CLuaInstMisc::miscFunctionDeprecated(lua_State *L, std::string oldFunc)
{

View File

@@ -352,8 +352,7 @@ int CLuaInstVideo::VideoDelete(lua_State *L)
deprecated functions
--------------------------------------------------------------- */
//#define VIDEO_FUNC_DEPRECATED videoFunctionDeprecated
#define VIDEO_FUNC_DEPRECATED(...)
#define VIDEO_FUNC_DEPRECATED videoFunctionDeprecated
void CLuaInstVideo::videoFunctionDeprecated(lua_State *L, std::string oldFunc)
{