X-Git-Url: https://git.saurik.com/apple/libc.git/blobdiff_plain/3d9156a7a519a5e3aa1b92e9d9d4b991f1aed7ff..a9aaacca3a68bb8d74fec09d8d8681a0efda2581:/locale/FreeBSD/wcwidth.c diff --git a/locale/FreeBSD/wcwidth.c b/locale/FreeBSD/wcwidth.c index 288a60d..ae533e7 100644 --- a/locale/FreeBSD/wcwidth.c +++ b/locale/FreeBSD/wcwidth.c @@ -18,10 +18,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. @@ -40,7 +36,9 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/locale/wcwidth.c,v 1.7 2004/08/12 12:19:11 tjr Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/locale/wcwidth.c,v 1.8 2007/01/09 00:28:01 imp Exp $"); + +#include "xlocale_private.h" #include @@ -50,5 +48,13 @@ int wcwidth(wchar_t wc) { - return (__wcwidth(wc)); + return (__wcwidth_l(wc, __current_locale())); +} + +int +wcwidth_l(wchar_t wc, locale_t loc) +{ + + NORMALIZE_LOCALE(loc); + return (__wcwidth_l(wc, loc)); }