Mercurial > hg > octave-nkf > gnulib-hg
changeset 2772:ec142580c1ee
(_XOPEN_SOURCE): Don't define; this causes problems on Solaris 7.
(wcwidth) [!HAVE_DECL_WCWIDTH]: Declare.
author | Jim Meyering <jim@meyering.net> |
---|---|
date | Mon, 24 Jul 2000 06:41:58 +0000 |
parents | 669ce16c1793 |
children | dd88c0c8c8f2 |
files | lib/mbswidth.c |
diffstat | 1 files changed, 13 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/lib/mbswidth.c +++ b/lib/mbswidth.c @@ -21,11 +21,6 @@ # include <config.h> #endif -/* Tell GNU libc to declare wcwidth(). */ -#ifndef _XOPEN_SOURCE -# define _XOPEN_SOURCE 500 -#endif - /* Get MB_LEN_MAX. */ #if HAVE_LIMITS_H # include <limits.h> @@ -62,10 +57,20 @@ # define mbsinit(ps) 1 #endif -/* If wcwidth() doesn't exist, assume all printable characters have +#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. */ -#if !defined wcwidth && !HAVE_WCWIDTH -# define wcwidth(wc) ((wc) == 0 ? 0 : iswprint (wc) ? 1 : -1) +# define wcwidth(wc) ((wc) == 0 ? 0 : iswprint (wc) ? 1 : -1) +# else +# endif #endif /* Get ISPRINT. */