aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEli Zaretskii2015-08-21 11:46:07 +0300
committerEli Zaretskii2015-08-21 11:46:07 +0300
commit092e17b1978d804df99fae9436f24c0ea0d7e034 (patch)
tree3fa42fc7c86d82603d170aa0df3598584afe3750 /src
parentff2f35fc478d0047fef4ae3e0b09f43c37961bec (diff)
downloademacs-092e17b1978d804df99fae9436f24c0ea0d7e034.tar.gz
emacs-092e17b1978d804df99fae9436f24c0ea0d7e034.zip
Fix MinGW64 build broken by latest w32uniscribe.c changes
* src/w32uniscribe.c (UNISCRIBE_OPENTYPE): Define to 0x0100, for MinGW64. Reported by Andy Moreton <andrewjmoreton@gmail.com>. (Bug#21260)
Diffstat (limited to 'src')
-rw-r--r--src/w32uniscribe.c9
1 files changed, 9 insertions, 0 deletions
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 <http://www.gnu.org/licenses/>. */
25 of calling non-existent functions. */ 25 of calling non-existent functions. */
26#undef _WIN32_WINNT 26#undef _WIN32_WINNT
27#define _WIN32_WINNT 0x500 27#define _WIN32_WINNT 0x500
28/* MinGW64 w32api headers by default define OPENTYPE_TAG typedef only
29 if _WIN32_WINNT >= 0x0600; defining UNISCRIBE_OPENTYPE as below
30 makes that typedef visible even for lower values of _WIN32_WINNT.
31 Mingw.org's w32api headers don't use UNISCRIBE_OPENTYPE at all, and
32 the OPENTYPE_TAG typedef is defined unconditionally there. */
33#ifdef UNISCRIBE_OPENTYPE
34# undef UNISCRIBE_OPENTYPE
35#endif
36#define UNISCRIBE_OPENTYPE 0x0100
28#include <windows.h> 37#include <windows.h>
29#include <usp10.h> 38#include <usp10.h>
30 39