diff options
| author | Eric Blake <ebb9@byu.net> | 2006-06-28 13:11:03 +0000 |
|---|---|---|
| committer | Eric Blake <ebb9@byu.net> | 2006-06-28 13:11:03 +0000 |
| commit | 72334d04f6b9cf71353d114686895dd1d042a973 (patch) | |
| tree | ca16100c616bb496b5d27ef0026c86a92bdb3f6a /lib/mbswidth.c | |
| parent | f5e6e9801a33eda719a723fcae8244e2fe25a056 (diff) | |
| download | gnulib-72334d04f6b9cf71353d114686895dd1d042a973.tar.gz | |
* mbchar.h (wcwidth): Include wcwidth.h.
* mbswidth.c (wcwidth): Move from here...
* wcwidth.h: ...to this new file.
Diffstat (limited to 'lib/mbswidth.c')
| -rw-r--r-- | lib/mbswidth.c | 35 |
1 files changed, 3 insertions, 32 deletions
diff --git a/lib/mbswidth.c b/lib/mbswidth.c index c9e78d6502..754d6df411 100644 --- a/lib/mbswidth.c +++ b/lib/mbswidth.c @@ -1,5 +1,5 @@ /* Determine the number of screen columns needed for a string. - Copyright (C) 2000-2005 Free Software Foundation, Inc. + Copyright (C) 2000-2006 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -33,23 +33,9 @@ #include <ctype.h> /* Get mbstate_t, mbrtowc(), mbsinit(), wcwidth(). */ -#if HAVE_WCHAR_H -/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before - <wchar.h>. - BSD/OS 4.1 has a bug: <stdio.h> and <time.h> must be included before - <wchar.h>. */ -# include <stdio.h> -# include <time.h> -# include <wchar.h> -#endif +#include "wcwidth.h" -/* Get iswprint(), iswcntrl(). */ -#if HAVE_WCTYPE_H -# include <wctype.h> -#endif -#if !defined iswprint && !HAVE_ISWPRINT -# define iswprint(wc) 1 -#endif +/* Get iswcntrl(). */ #if !defined iswcntrl && !HAVE_ISWCNTRL # define iswcntrl(wc) 0 #endif @@ -60,21 +46,6 @@ # endif #endif -#ifndef HAVE_DECL_WCWIDTH -"this configure-time declaration test was not run" -#endif -#if !HAVE_DECL_WCWIDTH -int wcwidth (); -#endif - -#ifndef wcwidth -# if !HAVE_WCWIDTH -/* wcwidth doesn't exist, so assume all printable characters have - width 1. */ -# define wcwidth(wc) ((wc) == 0 ? 0 : iswprint (wc) ? 1 : -1) -# endif -#endif - /* Get ISPRINT. */ #if defined (STDC_HEADERS) || (!defined (isascii) && !defined (HAVE_ISASCII)) # define IN_CTYPE_DOMAIN(c) 1 |