Nikolay Sivov : dwrite_2.idl: Protect from D3DCOLORVALUE redefinition.
Alexandre Julliard
julliard at wine.codeweavers.com
Fri Dec 12 13:55:48 CST 2014
Module: wine
Branch: master
Commit: 099146a6f9990c17f857be364caf4683238a0ee4
URL: http://source.winehq.org/git/wine.git/?a=commit;h=099146a6f9990c17f857be364caf4683238a0ee4
Author: Nikolay Sivov <nsivov at codeweavers.com>
Date: Fri Dec 12 14:35:49 2014 +0300
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 26523da..d2960eb 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;
More information about the wine-cvs
mailing list