diff options
| author | Baptiste Daroussin <bapt@FreeBSD.org> | 2024-06-20 08:11:38 +0000 |
|---|---|---|
| committer | Baptiste Daroussin <bapt@FreeBSD.org> | 2024-06-20 08:11:38 +0000 |
| commit | 24fa7a5107c5b75d1c197accf0305be64bc72882 (patch) | |
| tree | 183f09c93417ac0e5f7f49760329a3d2cfaacda9 /ncurses/wcwidth.h | |
| parent | bf0ab54638a5ef969749f6ceae30e864f9556ea8 (diff) | |
Diffstat (limited to 'ncurses/wcwidth.h')
| -rw-r--r-- | ncurses/wcwidth.h | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/ncurses/wcwidth.h b/ncurses/wcwidth.h index ccae41a9b994..76673da65845 100644 --- a/ncurses/wcwidth.h +++ b/ncurses/wcwidth.h @@ -59,6 +59,16 @@ * Latest version: http://www.cl.cam.ac.uk/~mgk25/ucs/wcwidth.c */ +#ifndef _WCWIDTH_H_incl +#define _WCWIDTH_H_incl 1 + +#ifdef __cplusplus +extern "C" { +#endif + +#include <ncurses_cfg.h> +#include <ncurses_dll.h> + #include <wchar.h> struct interval { @@ -187,7 +197,7 @@ NCURSES_EXPORT(int) mk_wcwidth(wchar_t ucs) /* if we arrive here, ucs is not a combining or C0/C1 control character */ - return 1 + + return 1 + (ucs >= 0x1100 && (ucs <= 0x115f || /* Hangul Jamo init. consonants */ ucs == 0x2329 || ucs == 0x232a || @@ -310,3 +320,9 @@ NCURSES_EXPORT(int) mk_wcswidth_cjk(const wchar_t *pwcs, size_t n) return width; } + +#ifdef __cplusplus +} +#endif + +#endif /* _WCWIDTH_H_incl 1 */ |