From 099146a6f9990c17f857be364caf4683238a0ee4 Mon Sep 17 00:00:00 2001
From: Nikolay Sivov <nsivov@codeweavers.com>
Date: Fri, 12 Dec 2014 14:35:49 +0300
Subject: [PATCH] dwrite_2.idl: Protect from D3DCOLORVALUE redefinition.

---
 include/dwrite_2.idl | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/include/dwrite_2.idl b/include/dwrite_2.idl
index 26523dacd67..d2960eb2bca 100644
--- a/include/dwrite_2.idl
+++ b/include/dwrite_2.idl
@@ -47,6 +47,7 @@ typedef struct DWRITE_TEXT_METRICS1
     FLOAT heightIncludingTrailingWhitespace;
 } DWRITE_TEXT_METRICS1;
 
+cpp_quote("#ifndef D3DCOLORVALUE_DEFINED")
 typedef struct _D3DCOLORVALUE
 {
     union {
@@ -66,6 +67,8 @@ typedef struct _D3DCOLORVALUE
         FLOAT dvA;
     };
 } D3DCOLORVALUE;
+cpp_quote("#define D3DCOLORVALUE_DEFINED")
+cpp_quote("#endif")
 
 typedef D3DCOLORVALUE DWRITE_COLOR_F;
 
-- 
2.11.4.GIT