2007-01-08 Bruno Haible <bruno@clisp.org>

[gnulib.git] / lib / mbswidth.c

diff --git a/lib/mbswidth.c b/lib/mbswidth.c
index 0726951..1d282b6 100644 (file)
--- 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