v2: added separate definition for C
From 8252ec9bb36419722fc810af8c53a7f40e4dd208 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 | 32 +++++++++++++++++++++++++++-
1 file changed, 31 insertions(+), 1 deletion(-)
diff --git a/mingw-w64-headers/include/dwrite_1.h
b/mingw-w64-headers/include/dwrite_1.h
index 87fbdffc..bf71c5ca 100644
--- a/mingw-w64-headers/include/dwrite_1.h
+++ b/mingw-w64-headers/include/dwrite_1.h
@@ -58,7 +58,36 @@ struct DWRITE_UNICODE_RANGE {
UINT32 last;
};
-struct DWRITE_FONT_METRICS1 : public DWRITE_FONT_METRICS {
+#ifdef __cplusplus
+struct DWRITE_FONT_METRICS1 : public DWRITE_FONT_METRICS
+{
+ INT16 glyphBoxLeft;
+ INT16 glyphBoxTop;
+ INT16 glyphBoxRight;
+ INT16 glyphBoxBottom;
+ INT16 subscriptPositionX;
+ INT16 subscriptPositionY;
+ INT16 subscriptSizeX;
+ INT16 subscriptSizeY;
+ INT16 superscriptPositionX;
+ INT16 superscriptPositionY;
+ INT16 superscriptSizeX;
+ INT16 superscriptSizeY;
+ BOOL hasTypographicMetrics;
+};
+#else
+struct DWRITE_FONT_METRICS1
+{
+ UINT16 designUnitsPerEm;
+ UINT16 ascent;
+ UINT16 descent;
+ INT16 lineGap;
+ UINT16 capHeight;
+ UINT16 xHeight;
+ INT16 underlinePosition;
+ UINT16 underlineThickness;
+ INT16 strikethroughPosition;
+ UINT16 strikethroughThickness;
INT16 glyphBoxLeft;
INT16 glyphBoxTop;
INT16 glyphBoxRight;
@@ -73,6 +102,7 @@ struct DWRITE_FONT_METRICS1 : public DWRITE_FONT_METRICS {
INT16 superscriptSizeY;
BOOL hasTypographicMetrics;
};
+#endif
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
