commit 099146a6f9990c17f857be364caf4683238a0ee4
author Nikolay Sivov <nsivov@codeweavers.com> Fri Dec 12 14:35:49 2014 +0300
committer Alexandre Julliard <julliard@winehq.org> Fri Dec 12 13:46:21 2014 +0100
tree 2c17634d6984983fbc9357849ae04cc5e24169d5
parent e5d7982c4d8b3c08c2d2c230b8b525a26d50fa76

dwrite_2.idl: Protect from D3DCOLORVALUE redefinition.

include/dwrite_2.idl

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