[Nano-devel] [PATCH 10/17] 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 ----
 src/nano.h   | 2 --
 4 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/autogen.sh b/autogen.sh
index 5f99b3f78b4c..edf4054688d4 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -12,10 +12,13 @@ modules="
        iswblank
        regex
        snprintf-posix
+       stdarg
        strcase
        strcasestr-simple
        strnlen
        vsnprintf-posix
+       wchar
+       wctype-h
 "
 
 # Make sure the local gnulib git repo is up-to-date.
diff --git a/configure.ac b/configure.ac
index 6ff491bfcffc..71389db7410a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -57,7 +57,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 3f80e31e7bcf..af9d7af452c9 100644
--- a/src/chars.c
+++ b/src/chars.c
@@ -26,12 +26,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. */
diff --git a/src/nano.h b/src/nano.h
index b21ccdb500f0..eba20ace86df 100644
--- a/src/nano.h
+++ b/src/nano.h
@@ -49,9 +49,7 @@
 #include <sys/param.h>
 #endif
 
-#ifdef HAVE_STDARG_H
 #include <stdarg.h>
-#endif
 
 /* Suppress warnings for __attribute__((warn_unused_result)). */
 #define IGNORE_CALL_RESULT(call) do { if (call) {} } while(0)
-- 
2.11.1