From 092e17b1978d804df99fae9436f24c0ea0d7e034 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Fri, 21 Aug 2015 11:46:07 +0300 Subject: [PATCH] Fix MinGW64 build broken by latest w32uniscribe.c changes * src/w32uniscribe.c (UNISCRIBE_OPENTYPE): Define to 0x0100, for MinGW64. Reported by Andy Moreton . (Bug#21260) --- src/w32uniscribe.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/w32uniscribe.c b/src/w32uniscribe.c index b1056bc104e..0e4177d06bf 100644 --- a/src/w32uniscribe.c +++ b/src/w32uniscribe.c @@ -25,6 +25,15 @@ along with GNU Emacs. If not, see . */ of calling non-existent functions. */ #undef _WIN32_WINNT #define _WIN32_WINNT 0x500 +/* MinGW64 w32api headers by default define OPENTYPE_TAG typedef only + if _WIN32_WINNT >= 0x0600; defining UNISCRIBE_OPENTYPE as below + makes that typedef visible even for lower values of _WIN32_WINNT. + Mingw.org's w32api headers don't use UNISCRIBE_OPENTYPE at all, and + the OPENTYPE_TAG typedef is defined unconditionally there. */ +#ifdef UNISCRIBE_OPENTYPE +# undef UNISCRIBE_OPENTYPE +#endif +#define UNISCRIBE_OPENTYPE 0x0100 #include #include -- 2.39.2