[PATCH] include: Avoid redefining the DWRITE_GLYPH_RUN_DESCRIPTION typedef.
Based on a patch by Alistair. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- include/dwrite.idl | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/include/dwrite.idl b/include/dwrite.idl index e6ab2b7ead4..bfb2c1b37d5 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 { -- 2.11.0
participants (1)
-
Henri Verbeet