[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Nano-devel] [PATCH 10/10] drop wchar.h/wctype.h/stdarg.h checks
From: |
Mike Frysinger |
Subject: |
[Nano-devel] [PATCH 10/10] drop wchar.h/wctype.h/stdarg.h checks |
Date: |
Mon, 20 Feb 2017 13:42:16 -0500 |
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 ee0e474fb298..418805caf59e 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 ffd61389002d..47ccfe2756ce 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
- [Nano-devel] [PATCH 00/10 v2] update autotools & add gnulib support, Mike Frysinger, 2017/02/20
- [Nano-devel] [PATCH 01/10] configure: require autoconf-2.69/automake-1.14, Mike Frysinger, 2017/02/20
- [Nano-devel] [PATCH 03/10] add support for gnulib, Mike Frysinger, 2017/02/20
- [Nano-devel] [PATCH 06/10] drop isblank/iswblank fallback functions, Mike Frysinger, 2017/02/20
- [Nano-devel] [PATCH 05/10] drop getdelim/getline fallback functions, Mike Frysinger, 2017/02/20
- [Nano-devel] [PATCH 04/10] drop various str fallback functions, Mike Frysinger, 2017/02/20
- [Nano-devel] [PATCH 10/10] drop wchar.h/wctype.h/stdarg.h checks,
Mike Frysinger <=
- [Nano-devel] [PATCH 07/10] assume regex.h support is always available, Mike Frysinger, 2017/02/20
- Re: [Nano-devel] [PATCH 07/10] assume regex.h support is always available, Benno Schulenberg, 2017/02/21
- Re: [Nano-devel] [PATCH 07/10] assume regex.h support is always available, Mike Frysinger, 2017/02/21
- Re: [Nano-devel] [PATCH 07/10] assume regex.h support is always available, Benno Schulenberg, 2017/02/21
- Re: [Nano-devel] [PATCH 07/10] assume regex.h support is always available, Mike Frysinger, 2017/02/21
- Re: [Nano-devel] [PATCH 07/10] assume regex.h support is always available, Mike Frysinger, 2017/02/22
- Re: [Nano-devel] [PATCH 07/10] assume regex.h support is always available, Benno Schulenberg, 2017/02/23
[Nano-devel] [PATCH 09/10] drop glib fallback for snprintf/vsnprintf, Mike Frysinger, 2017/02/20
[Nano-devel] [PATCH 08/10] assume getopt_long support is always available, Mike Frysinger, 2017/02/20
[Nano-devel] [PATCH 02/10] gettext: update to 0.18.3 release, Mike Frysinger, 2017/02/20