X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/5f4e628b09b4b279dc633d639ce4598a4acec26d..b03db5b6836720d38860cc5fca352fce7cf48c24:/wcwidth.c diff --git a/wcwidth.c b/wcwidth.c index 94ecb540..46ac1e35 100644 --- a/wcwidth.c +++ b/wcwidth.c @@ -69,7 +69,7 @@ struct interval { }; /* auxiliary function for binary search in interval table */ -static int bisearch(wchar_t ucs, const struct interval *table, int max) { +static int bisearch(unsigned int ucs, const struct interval *table, int max) { int min = 0; int mid; @@ -121,7 +121,7 @@ static int bisearch(wchar_t ucs, const struct interval *table, int max) { * in ISO 10646. */ -int mk_wcwidth(wchar_t ucs) +int mk_wcwidth(unsigned int ucs) { /* sorted list of non-overlapping intervals of non-spacing characters */ /* generated by "uniset +cat=Me +cat=Mn +cat=Cf -00AD +1160-11FF +200B c" */ @@ -198,7 +198,7 @@ int mk_wcwidth(wchar_t ucs) } -int mk_wcswidth(const wchar_t *pwcs, size_t n) +int mk_wcswidth(const unsigned int *pwcs, size_t n) { int w, width = 0; @@ -221,7 +221,7 @@ int mk_wcswidth(const wchar_t *pwcs, size_t n) * the traditional terminal character-width behaviour. It is not * otherwise recommended for general use. */ -int mk_wcwidth_cjk(wchar_t ucs) +int mk_wcwidth_cjk(unsigned int ucs) { /* sorted list of non-overlapping intervals of East Asian Ambiguous * characters, generated by "uniset +WIDTH-A -cat=Me -cat=Mn -cat=Cf c" */ @@ -289,7 +289,7 @@ int mk_wcwidth_cjk(wchar_t ucs) } -int mk_wcswidth_cjk(const wchar_t *pwcs, size_t n) +int mk_wcswidth_cjk(const unsigned int *pwcs, size_t n) { int w, width = 0;