From 51778ed4af069c0286cbe165d224dfd4524fc211 Mon Sep 17 00:00:00 2001
From: dhewg
Date: Mon, 23 Jan 2012 18:33:09 +0100
Subject: TASKBAR: Fix compilation with mingw-w64

mingw-compat.h is not required for newer mingw-w64, all required
symbols are present in the system headers.
---
 backends/taskbar/win32/win32-taskbar.cpp | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

(limited to 'backends/taskbar')

diff --git a/backends/taskbar/win32/win32-taskbar.cpp b/backends/taskbar/win32/win32-taskbar.cpp
index 046ddb1cd0..4cc451247b 100644
--- a/backends/taskbar/win32/win32-taskbar.cpp
+++ b/backends/taskbar/win32/win32-taskbar.cpp
@@ -29,12 +29,8 @@
 #if defined(WIN32) && defined(USE_TASKBAR)
 
 // Needed for taskbar functions
-#if defined(__GNUC__)
-#ifdef __MINGW32__
+#if defined(__GNUC__) && defined(__MINGW32__) && !defined(__MINGW64__)
 	#include "backends/taskbar/win32/mingw-compat.h"
-#else
-	#error Only compilation with MingW is supported
-#endif
 #else
 	// We need certain functions that are excluded by default
 	#undef NONLS
@@ -44,9 +40,12 @@
 		#undef ARRAYSIZE
 	#endif
 
-	// Default MSVC headers for ITaskbarList3 and IShellLink
-	#include <SDKDDKVer.h>
+	#if defined(_MSC_VER)
+		// Default MSVC headers for ITaskbarList3 and IShellLink
+		#include <SDKDDKVer.h>
+	#endif
 #endif
+
 #include <shlobj.h>
 
 // For HWND
-- 
cgit v1.2.3