mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-07 16:10:46 -08:00
Code Issues Projects Releases Wiki Activity

Fix MinGW64 build broken by latest w32uniscribe.c changes

Browse source 
* src/w32uniscribe.c (UNISCRIBE_OPENTYPE): Define to 0x0100, for
MinGW64.  Reported by Andy Moreton <andrewjmoreton@gmail.com>.
(Bug#21260)
This commit is contained in:
Eli Zaretskii 2015-08-21 11:46:07 +03:00
parent ff2f35fc47
commit 092e17b197
1 changed files with 9 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/w32uniscribe.c
View file

@ -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>