[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 092e17b: Fix MinGW64 build broken by latest w32unis
From: |
Eli Zaretskii |
Subject: |
[Emacs-diffs] master 092e17b: Fix MinGW64 build broken by latest w32uniscribe.c changes |
Date: |
Fri, 21 Aug 2015 08:47:27 +0000 |
branch: master
commit 092e17b1978d804df99fae9436f24c0ea0d7e034
Author: Eli Zaretskii <address@hidden>
Commit: Eli Zaretskii <address@hidden>
Fix MinGW64 build broken by latest w32uniscribe.c changes
* src/w32uniscribe.c (UNISCRIBE_OPENTYPE): Define to 0x0100, for
MinGW64. Reported by Andy Moreton <address@hidden>.
(Bug#21260)
---
src/w32uniscribe.c | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/src/w32uniscribe.c b/src/w32uniscribe.c
index b1056bc..0e4177d 100644
--- a/src/w32uniscribe.c
+++ b/src/w32uniscribe.c
@@ -25,6 +25,15 @@ along with GNU Emacs. If not, see
<http://www.gnu.org/licenses/>. */
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 <windows.h>
#include <usp10.h>
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master 092e17b: Fix MinGW64 build broken by latest w32uniscribe.c changes,
Eli Zaretskii <=