From c477ad1858a35a81666debbce66e7fca68b01483 Mon Sep 17 00:00:00 2001
From: Tor Lillqvist <tlillqvist@novell.com>
Date: Wed, 31 Aug 2011 10:58:46 +0300
Subject: Work around compilation errors with mingw-w64 and --enable-debug

---
 shell/inc/internal/utilities.hxx | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

(limited to 'shell')

diff --git a/shell/inc/internal/utilities.hxx b/shell/inc/internal/utilities.hxx
index 2697c8002dc6..3a410bf37e08 100644
--- a/shell/inc/internal/utilities.hxx
+++ b/shell/inc/internal/utilities.hxx
@@ -44,8 +44,31 @@
 
 #include <string>
 #define STRSAFE_NO_DEPRECATE
+#ifdef __MINGW32__
+
+// Work around lack of strsafe library in mingw-w64, do let their
+// strsafe.h provide inlines of StringCchVPrintfA etc, avoid linking
+// errors in a debug build.
+#ifdef __CRT__NO_INLINE
+#undef __CRT__NO_INLINE
+#define DID_UNDEFINE__CRT__NO_INLINE
+#endif
+
+extern "C" {
+
+#endif
+
 #include <strsafe.h>
 
+#ifdef __MINGW32__
+}
+
+#ifdef DID_UNDEFINE__CRT__NO_INLINE
+#define __CRT__NO_INLINE
+#endif
+
+#endif
+
 //---------------------------------
 /** Convert a string to a wstring
     using CP_ACP
-- 
cgit