[vlc-devel] [PATCH] win32/dirs: remove already defined CSIDLs

[Biswapriyo Nath]

-------------- next part --------------
From 7143510b91c607045d36a1fca400d27ad9b7a9c2 Mon Sep 17 00:00:00 2001
From: Biswapriyo Nath <nathbappai at gmail.com>
Date: Sat, 4 Apr 2020 01:51:37 +0530
Subject: [PATCH] win32/dirs: remove already defined CSIDLs

CSIDL_LOCAL_APPDATA and CSIDL_FLAG_MASK are defined in mingw-w64

Signed-off-by: Biswapriyo Nath <nathbappai at gmail.com>
---
 src/win32/dirs.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/win32/dirs.c b/src/win32/dirs.c
index a9c0d68..f50742c 100644
--- a/src/win32/dirs.c
+++ b/src/win32/dirs.c
@@ -52,10 +52,6 @@
 #include <windows.storage.h>
 #include <roapi.h>
 
-#ifndef CSIDL_LOCAL_APPDATA
-# define CSIDL_LOCAL_APPDATA 0x001C
-#endif
-
 static HRESULT WinRTSHGetFolderPath(HWND hwnd, int csidl, HANDLE hToken, DWORD dwFlags, LPWSTR pszPath)
 {
     VLC_UNUSED(hwnd);
@@ -68,7 +64,7 @@ static HRESULT WinRTSHGetFolderPath(HWND hwnd, int csidl, HANDLE hToken, DWORD d
         return E_NOTIMPL;
 
     folder = NULL;
-    csidl &= ~0xFF00; /* CSIDL_FLAG_MASK */
+    csidl &= ~CSIDL_FLAG_MASK;
 
     if (csidl == CSIDL_APPDATA) {
         IApplicationDataStatics *appDataStatics = NULL;
-- 
2.26.0