diff options
| -rw-r--r-- | src/xutf8/fl_wcwidth.c | 4 | ||||
| -rw-r--r-- | src/xutf8/mk_wcwidth.c | 13 |
2 files changed, 16 insertions, 1 deletions
diff --git a/src/xutf8/fl_wcwidth.c b/src/xutf8/fl_wcwidth.c index 5e03caddb..005ade003 100644 --- a/src/xutf8/fl_wcwidth.c +++ b/src/xutf8/fl_wcwidth.c @@ -30,7 +30,9 @@ * forward declare the routines as static to avoid name leakage. */ -#include <wchar.h> +#include <stdio.h> /* for size_t only */ +typedef unsigned int wchar_t; /* supercede system wchar_t */ + static int mk_wcwidth(wchar_t ucs); static int mk_wcswidth(const wchar_t *pwcs, size_t n); static int mk_wcwidth_cjk(wchar_t ucs); diff --git a/src/xutf8/mk_wcwidth.c b/src/xutf8/mk_wcwidth.c index 61e822ad6..c0bebaecc 100644 --- a/src/xutf8/mk_wcwidth.c +++ b/src/xutf8/mk_wcwidth.c @@ -1,4 +1,10 @@ /* + * Important! + * This file should remain as close to Markus Kuhn's original source + * as possible for easy checking for changes later, however unlikely. + * All customisations to work with FLTK shall be annotated! + */ +/* * This is an implementation of wcwidth() and wcswidth() (defined in * IEEE Std 1002.1-2001) for Unicode. * @@ -59,7 +65,14 @@ * Latest version: http://www.cl.cam.ac.uk/~mgk25/ucs/wcwidth.c */ +/* + * FLTK - avoid possible problems on systems with 32-bit wchar_t. + * In the first instance, wchar_t is superceded in calling file + * to avoid any unnecessary changes in this one. + */ +#if 0 #include <wchar.h> +#endif struct interval { int first; |