From d8a851a9a8b29ebf22b2746299697220e200eaa4 Mon Sep 17 00:00:00 2001 From: Peter Stephenson Date: Fri, 6 Jan 2006 11:41:47 +0000 Subject: 22123: probe for wcswidth() and assume 1 if not found --- ChangeLog | 5 +++++ Src/system.h | 4 ++++ configure.ac | 2 +- 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 47d758d90..cd66acc43 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2006-01-06 Peter Stephenson + + * 22123: configure.ac, Src/system.h: probe for wcswidth() and + assume 1 if not found. + 2006-01-05 Peter Stephenson * 22118: Doc/Zsh/builtins.yo: fix documentation for what diff --git a/Src/system.h b/Src/system.h index 33804e71a..ccb12e0c0 100644 --- a/Src/system.h +++ b/Src/system.h @@ -703,6 +703,10 @@ extern short ospeed; */ # include # include +#ifndef HAVE_WCSWIDTH +/* wcswidth is missing on OpenBSD: assume single-width characters */ +#define wcswidth(x, y) (1) +#endif #endif #ifdef HAVE_LANGINFO_H # include diff --git a/configure.ac b/configure.ac index 0f74225dd..2c298d4a2 100644 --- a/configure.ac +++ b/configure.ac @@ -1121,7 +1121,7 @@ AC_CHECK_FUNCS(strftime difftime gettimeofday \ pcre_compile pcre_study pcre_exec \ nl_langinfo \ erand48 open_memstream \ - wctomb mbrtowc wcrtomb iconv \ + wctomb mbrtowc wcrtomb wcswidth iconv \ grantpt unlockpt ptsname \ htons ntohs) AC_FUNC_STRCOLL -- cgit v1.2.3