From f3e9ec546a811f31b4a0c934f0b1c6fa571fa020 Mon Sep 17 00:00:00 2001
From: Andrew den Exter <andrew.den-exter@nokia.com>
Date: Wed, 7 Apr 2010 15:48:12 +1000
Subject: Fix Phonon build with mingw.

Don't include comdef.h unless building with MSVC.

Reviewed-by: Jason McDonald
---
 src/3rdparty/phonon/ds9/mediaobject.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/3rdparty/phonon/ds9/mediaobject.cpp b/src/3rdparty/phonon/ds9/mediaobject.cpp
index d1e15c0..b9a8713 100644
--- a/src/3rdparty/phonon/ds9/mediaobject.cpp
+++ b/src/3rdparty/phonon/ds9/mediaobject.cpp
@@ -27,7 +27,9 @@ along with this library.  If not, see <http://www.gnu.org/licenses/>.
 #include <objbase.h>
 #include <initguid.h>
 #include <qnetwork.h>
-#include <comdef.h>
+#ifdef Q_CC_MSVC
+# include <comdef.h>
+#endif
 #include <evcode.h>
 
 #include "mediaobject.h"
@@ -851,8 +853,10 @@ namespace Phonon
                 ushort buffer[MAX_ERROR_TEXT_LEN];
                 if (getErrorText && getErrorText(hr, (WCHAR*)buffer, MAX_ERROR_TEXT_LEN)) {
                     m_errorString = QString::fromUtf16(buffer);
+#ifdef Q_CC_MSVC
                 } else {
                     m_errorString = QString::fromUtf16((ushort*)_com_error(hr).ErrorMessage());
+#endif
                 }
                 const QString comError = QString::number(uint(hr), 16);
                 if (!m_errorString.toLower().contains(comError.toLower())) {
-- 
cgit v0.12