[vlc-devel] [PATCH] don't include win32 shell headers in Winstore apps

Steve Lhomme robux4 at videolabs.io
Tue Oct 24 14:00:28 CEST 2017


The API's are not available and the calls are not made in that case
---
 modules/access/file.c | 4 +++-
 src/win32/dirs.c      | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/modules/access/file.c b/modules/access/file.c
index 938b1369e8..34a63beb0a 100644
--- a/modules/access/file.c
+++ b/modules/access/file.c
@@ -47,7 +47,9 @@
 #if defined( _WIN32 )
 #   include <io.h>
 #   include <ctype.h>
-#   include <shlwapi.h>
+#   if !VLC_WINSTORE_APP
+#      include <shlwapi.h>
+#   endif
 #else
 #   include <unistd.h>
 #endif
diff --git a/src/win32/dirs.c b/src/win32/dirs.c
index cf68bf16cc..3f4ab0f368 100644
--- a/src/win32/dirs.c
+++ b/src/win32/dirs.c
@@ -37,7 +37,9 @@
 # include <w32api.h>
 #endif
 #include <direct.h>
-#include <shlobj.h>
+#if !VLC_WINSTORE_APP
+# include <shlobj.h>
+#endif
 
 #include "../libvlc.h"
 #include <vlc_charset.h>
-- 
2.14.2



More information about the vlc-devel mailing list