Henri Verbeet : include: Avoid redefining the DWRITE_GLYPH_RUN_DESCRIPTION typedef.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: d771bd72965b64c407db2767f13471d224e7b946
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=d771bd72965b64c407db2767f...

Author: Henri Verbeet 
Date:   Wed Jul 11 17:47:24 2018 +0430

include: Avoid redefining the DWRITE_GLYPH_RUN_DESCRIPTION typedef.

Based on a patch by Alistair Leslie-Hughes.

Signed-off-by: Henri Verbeet 
Signed-off-by: Alexandre Julliard

---

include/dwrite.idl | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/include/dwrite.idl b/include/dwrite.idl
index e6ab2b7..bfb2c1b 100644
--- a/include/dwrite.idl
+++ b/include/dwrite.idl
@@ -404,14 +404,18 @@ struct DWRITE_GLYPH_RUN
     UINT32 bidiLevel;
 };

-typedef struct DWRITE_GLYPH_RUN_DESCRIPTION
+cpp_quote("#ifndef __d2d1_1_h__")
+typedef struct DWRITE_GLYPH_RUN_DESCRIPTION DWRITE_GLYPH_RUN_DESCRIPTION;
+cpp_quote("#endif /* __d2d1_1_h__ */")
+
+struct DWRITE_GLYPH_RUN_DESCRIPTION
 {
     WCHAR const* localeName;
     WCHAR const* string;
     UINT32 stringLength;
     UINT16 const* clusterMap;
     UINT32 textPosition;
-} DWRITE_GLYPH_RUN_DESCRIPTION;
+};

typedef struct DWRITE_UNDERLINE
 {