X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fmbswidth.c;h=1d282b60da863334f941eb4cb010a54548dfcb72;hb=93d45a6cea3e8c0959a430e0b3f5ae24fc600399;hp=072695172b5f33376f7cc42ca804a5cc1d286483;hpb=169011e9824dbee437f925f643a6f7e95f7f38c5;p=gnulib.git

diff --git a/lib/mbswidth.c b/lib/mbswidth.c
index 072695172..1d282b60d 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"
@@ -47,12 +45,7 @@
 #include "wcwidth.h"
 
 /* Get iswcntrl().  */
-#if HAVE_WCTYPE_H
-# include <wctype.h>
-#endif
-#if !defined iswcntrl && !HAVE_ISWCNTRL
-# define iswcntrl(wc) (((wc) & ~0x1f) == 0 || (wc) == 0x7f)
-#endif
+#include <wctype.h>
 
 #ifndef mbsinit
 # if !HAVE_MBSINIT