ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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>
This commit is contained in:
Henri Verbeet 2018-07-11 17:29:24 +04:30 committed by Alexandre Julliard
parent c9f174f0ca
commit d771bd7296
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/dwrite.idl
View File

@ -404,14 +404,18 @@ struct DWRITE_GLYPH_RUN
UINT32 bidiLevel; 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* localeName;
WCHAR const* string; WCHAR const* string;
UINT32 stringLength; UINT32 stringLength;
UINT16 const* clusterMap; UINT16 const* clusterMap;
UINT32 textPosition; UINT32 textPosition;
} DWRITE_GLYPH_RUN_DESCRIPTION; };
typedef struct DWRITE_UNDERLINE typedef struct DWRITE_UNDERLINE
{ {