[Nano-devel] [PATCH 8/8] drop wchar.h/wctype.h/stdarg.h checks

[Mike Frysinger]

Since gnulib provides these now, we can assume them.
---
 autogen.sh   | 3 +++
 configure.ac | 2 +-
 src/chars.c  | 4 ----
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/autogen.sh b/autogen.sh
index 58c9d18..510b591 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -9,10 +9,13 @@ modules="
        iswblank
        regex
        snprintf-posix
+       stdarg
        strcase
        strcasestr-simple
        strnlen
        vsnprintf-posix
+       wchar
+       wctype-h
 "
 if [ -n "${GNULIB_SRCDIR}" ]; then
        rm -rf lib
diff --git a/configure.ac b/configure.ac
index 8e15365..746ce58 100644
--- a/configure.ac
+++ b/configure.ac
@@ -61,7 +61,7 @@ AC_DEFINE_DIR([PKGDATADIR], [pkgdatadir], [Where data are 
placed to.])
 
 dnl Checks for header files.
 
-AC_CHECK_HEADERS(libintl.h limits.h sys/param.h wchar.h wctype.h stdarg.h)
+AC_CHECK_HEADERS(libintl.h limits.h sys/param.h)
 
 dnl Checks for options.
 
diff --git a/src/chars.c b/src/chars.c
index 833e8ce..ace271f 100644
--- a/src/chars.c
+++ b/src/chars.c
@@ -27,12 +27,8 @@
 #include <ctype.h>
 
 #ifdef ENABLE_UTF8
-#ifdef HAVE_WCHAR_H
 #include <wchar.h>
-#endif
-#ifdef HAVE_WCTYPE_H
 #include <wctype.h>
-#endif
 
 static bool use_utf8 = FALSE;
        /* Whether we've enabled UTF-8 support. */
-- 
2.6.2