dwrite_2.idl: Protect from D3DCOLORVALUE redefinition.

099146a6 · Nikolay Sivov · Alexandre Julliard · e5d7982c · 099146a6
Commit 099146a6 authored Dec 12, 2014 by Nikolay Sivov Committed by Alexandre Julliard Dec 12, 2014
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 0 deletions

dwrite_2.idl include/dwrite_2.idl +3 -0

No files found.
--- 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;