vlc | branch: master | Rémi Denis-Courmont <[email protected]> | Sat Mar 28 
19:15:35 2015 +0200| [e7ef356de5e6d6f931478e92cc000480d8284974] | committer: 
Rémi Denis-Courmont

qt4: fix duplicate symbol

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=e7ef356de5e6d6f931478e92cc000480d8284974
---

 modules/gui/qt4/components/simple_preferences.cpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/gui/qt4/components/simple_preferences.cpp 
b/modules/gui/qt4/components/simple_preferences.cpp
index 0d78109..2a93bb0 100644
--- a/modules/gui/qt4/components/simple_preferences.cpp
+++ b/modules/gui/qt4/components/simple_preferences.cpp
@@ -1243,7 +1243,7 @@ bool SPrefsPanel::addType( const char * psz_ext, 
QTreeWidgetItem* current,
 #if !defined(__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}};
+    extern const GUID CLSID_ApplicationAssociationRegistrationUI;
     interface IApplicationAssociationRegistrationUI : public IUnknown
     {
         virtual HRESULT STDMETHODCALLTYPE LaunchAdvancedAssociationUI(

_______________________________________________
vlc-commits mailing list
[email protected]
https://mailman.videolan.org/listinfo/vlc-commits

Reply via email to