diff options
| author | José Fonseca <jfonseca@vmware.com> | 2014-06-13 12:38:58 +0100 |
|---|---|---|
| committer | José Fonseca <jfonseca@vmware.com> | 2014-06-13 12:38:58 +0100 |
| commit | d1819f6bda486bd9d4f1c553a7e149370b56e8f4 (patch) | |
| tree | 1c6c0571860f0b67ab0cd28de0bd2c5d0c3a9f8d /dispatch | |
| parent | 7d79627948defb2cccc83e071c45cdbf031b44a8 (diff) | |
ddrawtrace: Fix build with recent SDK headers.
Diffstat (limited to 'dispatch')
| -rw-r--r-- | dispatch/compat.h | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/dispatch/compat.h b/dispatch/compat.h index 6f55ca54..2f5a9a49 100644 --- a/dispatch/compat.h +++ b/dispatch/compat.h @@ -31,6 +31,16 @@ /* + * 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 * * These are typically defined in sal.h. @@ -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 |