---
From 8096ec452013f96a48b08d886e8abb547e5f413f Mon Sep 17 00:00:00 2001
From: Nikolay Sivov <nsi...@codeweavers.com>
Date: Fri, 25 Jan 2019 01:25:19 +0300
Subject: [PATCH] headers: Make dwrite_1.h C friendly.
Signed-off-by: Nikolay Sivov <nsi...@codeweavers.com>
---
mingw-w64-headers/include/dwrite_1.h | 20 ++++++++++++++++++--
1 file changed, 18 insertions(+), 2 deletions(-)
diff --git a/mingw-w64-headers/include/dwrite_1.h
b/mingw-w64-headers/include/dwrite_1.h
index 87fbdffc..52de1fc7 100644
--- a/mingw-w64-headers/include/dwrite_1.h
+++ b/mingw-w64-headers/include/dwrite_1.h
@@ -58,7 +58,23 @@ struct DWRITE_UNICODE_RANGE {
UINT32 last;
};
-struct DWRITE_FONT_METRICS1 : public DWRITE_FONT_METRICS {
+struct DWRITE_FONT_METRICS1
+#ifdef __cplusplus
+ : public DWRITE_FONT_METRICS
+#endif
+{
+#ifndef __cplusplus
+ UINT16 designUnitsPerEm;
+ UINT16 ascent;
+ UINT16 descent;
+ INT16 lineGap;
+ UINT16 capHeight;
+ UINT16 xHeight;
+ INT16 underlinePosition;
+ UINT16 underlineThickness;
+ INT16 strikethroughPosition;
+ UINT16 strikethroughThickness;
+#endif
INT16 glyphBoxLeft;
INT16 glyphBoxTop;
INT16 glyphBoxRight;
@@ -71,7 +87,7 @@ struct DWRITE_FONT_METRICS1 : public DWRITE_FONT_METRICS {
INT16 superscriptPositionY;
INT16 superscriptSizeX;
INT16 superscriptSizeY;
- BOOL hasTypographicMetrics;
+ WINBOOL hasTypographicMetrics;
};
struct DWRITE_SCRIPT_PROPERTIES
--
2.20.1
_______________________________________________
Mingw-w64-public mailing list
Mingw-w64-public@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/mingw-w64-public
