Mercurial > hg > octave-lojdl > gnulib-hg

comparison lib/wcwidth.c @ 16385:a9e289a3a38d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
streq: Rename macro. * lib/streq.h (STREQ_OPT): Renamed from STREQ. * NEWS: Mention the change. * lib/mbrtowc.c (mbrtowc): Update. * lib/uniwidth/cjk.h (is_cjk_encoding): Update. * lib/wcwidth.c (wcwidth): Update. Suggested by Akim Demaille and Jim Meyering.
author Bruno Haible <bruno@clisp.org>
date Fri, 24 Feb 2012 12:33:07 +0100
parents 8250f2777afc
children e542fd46ad6f
comparison
equal deleted inserted replaced
16384:dde8c368829d 16385:a9e289a3a38d
30 wcwidth (wchar_t wc) 30 wcwidth (wchar_t wc)
31 #undef wcwidth 31 #undef wcwidth
32 { 32 {
33 /* In UTF-8 locales, use a Unicode aware width function. */ 33 /* In UTF-8 locales, use a Unicode aware width function. */
34 const char *encoding = locale_charset (); 34 const char *encoding = locale_charset ();
35 if (STREQ (encoding, "UTF-8", 'U', 'T', 'F', '-', '8', 0, 0, 0 ,0)) 35 if (STREQ_OPT (encoding, "UTF-8", 'U', 'T', 'F', '-', '8', 0, 0, 0 ,0))
36 { 36 {
37 /* We assume that in a UTF-8 locale, a wide character is the same as a 37 /* We assume that in a UTF-8 locale, a wide character is the same as a
38 Unicode character. */ 38 Unicode character. */
39 return uc_width (wc, encoding); 39 return uc_width (wc, encoding);
40 } 40 }