diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2015-08-21 17:45:41 +0300 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2015-08-21 17:45:41 +0300 |
| commit | 8583c215a24e31974bb47dccf56f9d3933f17c55 (patch) | |
| tree | 53a40e78e72fed47b63bfd6e35b80425f0c45235 /src/w32uniscribe.c | |
| parent | 1c671d650ce8da0b09494fb43987c9449331ed63 (diff) | |
| download | emacs-8583c215a24e31974bb47dccf56f9d3933f17c55.tar.gz emacs-8583c215a24e31974bb47dccf56f9d3933f17c55.tar.bz2 emacs-8583c215a24e31974bb47dccf56f9d3933f17c55.zip | |
A better fix for bug#21303
* src/w32uniscribe.c (_WIN32_WINNT): Define to 0x0600. This is a
cleaner fix for Bug#21260 than the previous change.
Diffstat (limited to 'src/w32uniscribe.c')
| -rw-r--r-- | src/w32uniscribe.c | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/src/w32uniscribe.c b/src/w32uniscribe.c index 0e4177d06bf..ec14dbe19b7 100644 --- a/src/w32uniscribe.c +++ b/src/w32uniscribe.c @@ -18,22 +18,15 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ #include <config.h> -/* Override API version - Uniscribe is only available as standard since - Windows 2000, though most users of older systems will have it +/* Override API version - Uniscribe is only available as standard + since Windows 2000, though most users of older systems will have it since it installs with Internet Explorer 5.0 and other software. - We only enable the feature if it is available, so there is no chance - of calling non-existent functions. */ + Also, MinGW64 w32api headers by default define OPENTYPE_TAG typedef + only if _WIN32_WINNT >= 0x0600. We only use the affected APIs if + they are available, so there is no chance 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 +#define _WIN32_WINNT 0x0600 #include <windows.h> #include <usp10.h> |