X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fmbswidth.c;h=a207d0f6e36f6afb226695f650ac4b1604929eb6;hb=7fef1769f5bc137624077568f1a5016dbcee2fda;hp=48da6639dc112e683eeba4b546caf0241609cff5;hpb=49b3d0b77e5873f9e826dd166d8d0549ee5bfdf7;p=gnulib.git

diff --git a/lib/mbswidth.c b/lib/mbswidth.c
index 48da6639d..a207d0f6e 100644
--- a/lib/mbswidth.c
+++ b/lib/mbswidth.c
@@ -17,9 +17,7 @@
 
 /* Written by Bruno Haible <haible@clisp.cons.org>.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 /* Specification.  */
 #include "mbswidth.h"
@@ -51,7 +49,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