[vlc-commits] Lua: do not compile Console code when in WinStoreApp mode
Jean-Baptiste Kempf
git at videolan.org
Fri Mar 29 16:33:02 CET 2013
vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Fri Mar 29 17:25:37 2013 +0100| [b412ee7b0a7fe6a61d045e8d9a9533f6d5946b3c] | committer: Jean-Baptiste Kempf
Lua: do not compile Console code when in WinStoreApp mode
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=b412ee7b0a7fe6a61d045e8d9a9533f6d5946b3c
---
modules/lua/extension.c | 2 +-
modules/lua/intf.c | 2 +-
modules/lua/libs/win.c | 4 +++-
3 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/modules/lua/extension.c b/modules/lua/extension.c
index e408db6..1ebccdc 100644
--- a/modules/lua/extension.c
+++ b/modules/lua/extension.c
@@ -833,7 +833,7 @@ static lua_State* GetLuaState( extensions_manager_t *p_mgr,
luaopen_vlm( L );
luaopen_volume( L );
luaopen_xml( L );
-#ifdef WIN32
+#if defined(WIN32) && !defined(WINAPI_FAMILY_APP)
luaopen_win( L );
#endif
diff --git a/modules/lua/intf.c b/modules/lua/intf.c
index 9732ce9..e382647 100644
--- a/modules/lua/intf.c
+++ b/modules/lua/intf.c
@@ -266,7 +266,7 @@ static int Start_LuaIntf( vlc_object_t *p_this, const char *name )
luaopen_gettext( L );
luaopen_xml( L );
luaopen_equalizer( L );
-#ifdef WIN32
+#if defined(WIN32) && !defined(WINAPI_FAMILY_APP)
luaopen_win( L );
#endif
diff --git a/modules/lua/libs/win.c b/modules/lua/libs/win.c
index fd1c1e1..49a01f8 100644
--- a/modules/lua/libs/win.c
+++ b/modules/lua/libs/win.c
@@ -33,6 +33,8 @@
#include "../vlc.h"
#include "../libs.h"
+#ifndef WINAPI_FAMILY_APP
+
/* Based on modules/control/rc.c and include/vlc_interface.h */
static HANDLE GetConsole( lua_State *L )
{
@@ -156,4 +158,4 @@ void luaopen_win( lua_State *L )
lua_setfield( L, -2, "win" );
}
-
+#endif /* WINAPI_FAMILY_APP */
More information about the vlc-commits
mailing list