diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2015-08-21 11:46:07 +0300 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2015-08-21 11:46:07 +0300 |
| commit | 092e17b1978d804df99fae9436f24c0ea0d7e034 (patch) | |
| tree | 3fa42fc7c86d82603d170aa0df3598584afe3750 /src/w32uniscribe.c | |
| parent | ff2f35fc478d0047fef4ae3e0b09f43c37961bec (diff) | |
| download | emacs-092e17b1978d804df99fae9436f24c0ea0d7e034.tar.gz | |
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/w32uniscribe.c')
| -rw-r--r-- | src/w32uniscribe.c | 9 |
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/>. */ 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> |