android/opaque: fix crash on Close with subtitles

[vlc] / include / vlc_windows_interfaces.h

diff --git a/include/vlc_windows_interfaces.h b/include/vlc_windows_interfaces.h
index af6ac0fe0d6b839fbb8d14cc31cd2057e3f98a86..e4c41f261054a976c273270c156fa0ebd8170574 100644 (file)
--- a/include/vlc_windows_interfaces.h
+++ b/include/vlc_windows_interfaces.h
@@ -36,6 +36,9 @@
 #include <basetyps.h>
 #include <objbase.h>
 
+/* rpcndr.h defines small not only for idl */
+#undef small
+
 /* mingw.org fails to define this */
 #ifndef __ITaskbarList3_INTERFACE_DEFINED__
 #define __ITaskbarList3_INTERFACE_DEFINED__
@@ -81,10 +84,6 @@ typedef enum THUMBBUTTONFLAGS {
     THBF_NONINTERACTIVE = 0x10
 } THUMBBUTTONFLAGS;
 
-#ifndef THBN_CLICKED
-# define THBN_CLICKED        0x1800
-#endif
-
 #ifdef __cplusplus
 interface ITaskbarList : public IUnknown {
 public:
@@ -223,19 +222,10 @@ struct ITaskbarList3Vtbl
 #endif /* __cplusplus */
 #endif /* __ITaskbarList3_INTERFACE_DEFINED__ */
 
-/* mingw-w64 also fails to define this as of 2.0.1 */
-#ifndef __IApplicationAssociationRegistrationUI_INTERFACE_DEFINED__
-#define __IApplicationAssociationRegistrationUI_INTERFACE_DEFINED__
-const GUID IID_IApplicationAssociationRegistrationUI = {0x1f76a169,0xf994,0x40ac, {0x8f,0xc8,0x09,0x59,0xe8,0x87,0x47,0x10}};
-const GUID CLSID_ApplicationAssociationRegistrationUI = { 0x1968106d,0xf3b5,0x44cf,{0x89,0x0e,0x11,0x6f,0xcb,0x9e,0xce,0xf1}};
-#ifdef __cplusplus
+/* mingw-w64 also fails to define these as of 2.0.1 */
 
-interface IApplicationAssociationRegistrationUI : public IUnknown
-{
-    virtual HRESULT STDMETHODCALLTYPE LaunchAdvancedAssociationUI(
-        LPCWSTR pszAppRegName) = 0;
-};
-#endif /* __cplusplus */
-#endif /* __IApplicationAssociationRegistrationUI_INTERFACE_DEFINED__ */
+#ifndef THBN_CLICKED
+# define THBN_CLICKED        0x1800
+#endif
 
 #endif //MINGW_WORKAROUNDS_H