include: Avoid redefining the DWRITE_GLYPH_RUN_DESCRIPTION typedef.

Based on a patch by Alistair Leslie-Hughes. Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

include: Avoid redefining the DWRITE_GLYPH_RUN_DESCRIPTION typedef.
d771bd72 · Henri Verbeet · Alexandre Julliard · c9f174f0 · d771bd72
Commit d771bd72 authored Jul 11, 2018 by Henri Verbeet Committed by Alexandre Julliard Jul 11, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 2 deletions

dwrite.idl include/dwrite.idl +6 -2

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