From: Bruno Haible <bruno@clisp.org>
Date: Fri, 28 Jul 2006 15:31:45 +0000 (+0000)
Subject: Assume an ASCII compatible wide character encoding.
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=169011e9824dbee437f925f643a6f7e95f7f38c5;p=pspp

Assume an ASCII compatible wide character encoding.
---

diff --git a/lib/mbswidth.c b/lib/mbswidth.c
index 48da6639dc..072695172b 100644
--- a/lib/mbswidth.c
+++ b/lib/mbswidth.c
@@ -51,7 +51,7 @@
 # include <wctype.h>
 #endif
 #if !defined iswcntrl && !HAVE_ISWCNTRL
-# define iswcntrl(wc) 0
+# define iswcntrl(wc) (((wc) & ~0x1f) == 0 || (wc) == 0x7f)
 #endif
 
 #ifndef mbsinit
diff --git a/lib/wcwidth.h b/lib/wcwidth.h
index 9af75e0a77..1c95d0e11b 100644
--- a/lib/wcwidth.h
+++ b/lib/wcwidth.h
@@ -36,7 +36,13 @@
 #  include <wctype.h>
 # endif
 # if !defined iswprint && !HAVE_ISWPRINT
-#  define iswprint(wc) 1
+ststic inline int
+iswprint (wint_t wc)
+{
+  return (wc >= 0 && wc < 128
+	  ? wc >= ' ' && wc <= '~'
+	  : 1);
+}
 # endif
 
 # ifndef HAVE_DECL_WCWIDTH