diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2016-09-30 07:34:36 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2016-09-30 07:34:36 (GMT) |
| commit | 296b6203712e0a79f4e8facc83cb5518adb8b292 (patch) | |
| tree | 0b2a75b4c31558c929e3ed24fd8374b2924c8fc6 | |
| parent | be3a29538266c07c2c4805144dd6f1b31eb4b06e (diff) | |
| download | tk-296b6203712e0a79f4e8facc83cb5518adb8b292.zip tk-296b6203712e0a79f4e8facc83cb5518adb8b292.tar.gz tk-296b6203712e0a79f4e8facc83cb5518adb8b292.tar.bz2 | |
Fix UNIX build, and eliminate possible warning in Makefile
| -rw-r--r-- | generic/tkFont.c | 13 | ||||
| -rw-r--r-- | win/Makefile.in | 1 |
2 files changed, 9 insertions, 5 deletions
diff --git a/generic/tkFont.c b/generic/tkFont.c index 51b2fce..bec8807 100644 --- a/generic/tkFont.c +++ b/generic/tkFont.c @@ -13,7 +13,6 @@ #include "tkInt.h" #include "tkFont.h" -#include <windows.h> /* * The following structure is used to keep track of all the fonts that exist @@ -1716,11 +1715,15 @@ Tk_PostscriptFontName( upper = 1; } src += TkUtfToUniChar(src, &ch); - if (upper) { - ch = Tcl_UniCharToUpper(ch); - upper = 0; + if (ch <= 0xffff) { + if (upper) { + ch = Tcl_UniCharToUpper(ch); + upper = 0; + } else { + ch = Tcl_UniCharToLower(ch); + } } else { - ch = Tcl_UniCharToLower(ch); + upper = 0; } dest += TkUniCharToUtf(ch, dest); } diff --git a/win/Makefile.in b/win/Makefile.in index cc90b71..7e48213 100644 --- a/win/Makefile.in +++ b/win/Makefile.in @@ -27,6 +27,7 @@ exec_prefix = @exec_prefix@ bindir = @bindir@ libdir = @libdir@ includedir = @includedir@ +datarootdir = @datarootdir@ mandir = @mandir@ # The following definition can be set to non-null for special systems |