vlc | branch: master | Biswapriyo Nath <[email protected]> | Sat Apr 4 02:09:37 2020 +0530| [aa47366f31796f037bf9c195594af509835a905a] | committer: Steve Lhomme
win32/dirs: remove already defined CSIDLs CSIDL_LOCAL_APPDATA and CSIDL_FLAG_MASK are defined in mingw-w64 Signed-off-by: Biswapriyo Nath <[email protected]> Signed-off-by: Steve Lhomme <[email protected]> > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=aa47366f31796f037bf9c195594af509835a905a --- 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 a9c0d68022..f50742c9a2 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; _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
