X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fwcwidth.h;h=37b83cb82256867a2b3ed221d348b37d0c724436;hb=9779c75032dc76d2a77177bb0bfd66243ec57673;hp=80c0d9cda7510b3a5dec218cd5154d34db387963;hpb=72334d04f6b9cf71353d114686895dd1d042a973;p=gnulib.git

diff --git a/lib/wcwidth.h b/lib/wcwidth.h
index 80c0d9cda..37b83cb82 100644
--- a/lib/wcwidth.h
+++ b/lib/wcwidth.h
@@ -18,26 +18,39 @@
 #ifndef _gl_WCWIDTH_H
 #define _gl_WCWIDTH_H
 
+#if HAVE_WCHAR_T
+
 /* Get wcwidth if available, along with wchar_t.  */
-#if HAVE_WCHAR_H
+# 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 <stdio.h>
+#  include <time.h>
+#  include <wchar.h>
+# endif
 
 /* Get iswprint.  */
-#if HAVE_WCTYPE_H
-# include <wctype.h>
-#endif
-#if !defined iswprint && !HAVE_ISWPRINT
-# define iswprint(wc) 1
-#endif
+# if HAVE_WCTYPE_H
+#  include <wctype.h>
+# endif
+# if !defined iswprint && !HAVE_ISWPRINT
+static inline int
+iswprint (wint_t wc)
+{
+  return (wc >= 0 && wc < 128
+	  ? wc >= ' ' && wc <= '~'
+	  : 1);
+}
+#  define iswprint iswprint
+# endif
 
-#if !defined wcwidth && !HAVE_WCWIDTH
+# ifndef HAVE_DECL_WCWIDTH
+"this configure-time declaration test was not run"
+# endif
+# ifndef wcwidth
+#  if !HAVE_WCWIDTH
 
 /* wcwidth doesn't exist, so assume all printable characters have
    width 1.  */
@@ -47,6 +60,18 @@ wcwidth (wchar_t wc)
   return wc == 0 ? 0 : iswprint (wc) ? 1 : -1;
 }
 
-#endif
+#  elif !HAVE_DECL_WCWIDTH
+
+/* wcwidth exists but is not declared.  */
+extern
+#   ifdef __cplusplus
+"C"
+#   endif
+int wcwidth (int /* actually wchar_t */);
+
+#  endif
+# endif
+
+#endif /* HAVE_WCHAR_H */
 
 #endif /* _gl_WCWIDTH_H */