Re: [Mingw-w64-public] [PATCH] headers: Make dwrite_1.h C friendly.

[JonY via Mingw-w64-public]

On 1/24/19 10:27 PM, Nikolay Sivov wrote:
> ---
> 

Shouldn't there be an ifdef for C++/C case? So that the C++ compiler is
aware of the inheritance?



signature.asc
Description: OpenPGP digital signature
___
Mingw-w64-public mailing list
Mingw-w64-public@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/mingw-w64-public

[Mingw-w64-public] [PATCH] headers: Make dwrite_1.h C friendly.

[Nikolay Sivov]

---
From 0a52048e0368b043abc0791ef4c6969fc1e603ef Mon Sep 17 00:00:00 2001
From: Nikolay Sivov 
Date: Fri, 25 Jan 2019 01:25:19 +0300
Subject: [PATCH] headers: Make dwrite_1.h C friendly.

Signed-off-by: Nikolay Sivov 
---
 mingw-w64-headers/include/dwrite_1.h | 13 -
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/mingw-w64-headers/include/dwrite_1.h 
b/mingw-w64-headers/include/dwrite_1.h
index 87fbdffc..a3262207 100644
--- a/mingw-w64-headers/include/dwrite_1.h
+++ b/mingw-w64-headers/include/dwrite_1.h
@@ -58,7 +58,18 @@ struct DWRITE_UNICODE_RANGE {
 UINT32 last;
 };
 
-struct DWRITE_FONT_METRICS1 : public DWRITE_FONT_METRICS {
+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;
-- 
2.20.1

___
Mingw-w64-public mailing list
Mingw-w64-public@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/mingw-w64-public