From d1819f6bda486bd9d4f1c553a7e149370b56e8f4 Mon Sep 17 00:00:00 2001
From: José Fonseca <jfonseca@vmware.com>
Date: Fri, 13 Jun 2014 12:38:58 +0100
Subject: ddrawtrace: Fix build with recent SDK headers.

---
 dispatch/compat.h | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

(limited to 'dispatch')

diff --git a/dispatch/compat.h b/dispatch/compat.h
index 6f55ca54..2f5a9a49 100644
--- a/dispatch/compat.h
+++ b/dispatch/compat.h
@@ -30,6 +30,16 @@
 #ifdef __MINGW32__
 
 
+/*
+ * Several of the defines below clash with libstdc++ internal variables,
+ * so include the headers now, before they are re-defined.
+ */
+#include <algorithm>
+#include <iostream>
+#include <memory>
+#include <vector>
+
+
 /*
  * Dummy definitions Standard Annotation Language (SAL) definitions
  *
@@ -736,6 +746,14 @@
 #define DECLSPEC_NOVTABLE
 #endif
 
+#ifndef DECLSPEC_NOTHROW
+#define DECLSPEC_NOTHROW
+#endif
+
+#ifndef COM_DECLSPEC_NOTHROW
+#define COM_DECLSPEC_NOTHROW DECLSPEC_NOTHROW
+#endif
+
 #ifndef __MINGW64_VERSION_MAJOR
 #define INT8 signed char
 #define UINT8 unsigned char
-- 
cgit v1.2.3