From 5b4a1ff337973732ff9a5ad9b1cb84d74a7e6185 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Wed, 31 May 2017 09:44:08 +0300 Subject: [PATCH] Avoid compilation warning on MinGW in xstrndup libiberty/ChangeLog: 2017-05-31 DJ Delorie * configure.ac (strnlen): Add to AC_CHECK_DECLS. * configure: Likewise. * config.in: Add HACE_DECL_STRNLEN. --- libiberty/ChangeLog | 6 ++++++ libiberty/config.in | 4 ++++ libiberty/configure | 21 +++++++++++++++++++++ libiberty/configure.ac | 3 ++- 4 files changed, 33 insertions(+), 1 deletion(-) diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog index 2dd3ca7..4b19fef 100644 --- a/libiberty/ChangeLog +++ b/libiberty/ChangeLog @@ -1,3 +1,9 @@ +2017-05-31 DJ Delorie + + * configure.ac (strnlen): Add to AC_CHECK_DECLS. + * configure: Likewise. + * config.in: Add HACE_DECL_STRNLEN. + 2017-05-31 Eli Zaretskii * waitpid.c (wait) [__MINGW32__]: Define as a macro diff --git a/libiberty/config.in b/libiberty/config.in index 1ff50c6..66c78e8 100644 --- a/libiberty/config.in +++ b/libiberty/config.in @@ -79,6 +79,10 @@ don't. */ #undef HAVE_DECL_SNPRINTF +/* Define to 1 if you have the declaration of `strnlen', and to 0 if you + don't. */ +#undef HAVE_DECL_STRNLEN + /* Define to 1 if you have the declaration of `strtol', and to 0 if you don't. */ #undef HAVE_DECL_STRTOL diff --git a/libiberty/configure b/libiberty/configure index 8687935..ccadfaa 100755 --- a/libiberty/configure +++ b/libiberty/configure @@ -5864,6 +5864,16 @@ fi cat >>confdefs.h <<_ACEOF #define HAVE_DECL_STRTOULL $ac_have_decl _ACEOF +ac_fn_c_check_decl "$LINENO" "strnlen" "ac_cv_have_decl_strnlen" "$ac_includes_default" +if test "x$ac_cv_have_decl_strnlen" = x""yes; then : + ac_have_decl=1 +else + ac_have_decl=0 +fi + +cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_STRNLEN $ac_have_decl +_ACEOF $as_echo "#define HAVE_SYS_ERRLIST 1" >>confdefs.h @@ -7005,6 +7015,17 @@ cat >>confdefs.h <<_ACEOF #define HAVE_DECL_STRVERSCMP $ac_have_decl _ACEOF + ac_fn_c_check_decl "$LINENO" "strnlen" "ac_cv_have_decl_strnlen" "$ac_includes_default" +if test "x$ac_cv_have_decl_strnlen" = x""yes; then : + ac_have_decl=1 +else + ac_have_decl=0 +fi + +cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_STRNLEN $ac_have_decl +_ACEOF + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether canonicalize_file_name must be declared" >&5 $as_echo_n "checking whether canonicalize_file_name must be declared... " >&6; } if test "${libiberty_cv_decl_needed_canonicalize_file_name+set}" = set; then : diff --git a/libiberty/configure.ac b/libiberty/configure.ac index 1aa0c7c..6917cfa 100644 --- a/libiberty/configure.ac +++ b/libiberty/configure.ac @@ -416,7 +416,7 @@ if test "x" = "y"; then table times tmpnam \ vasprintf vfprintf vprintf vsprintf \ wait3 wait4 waitpid) - AC_CHECK_DECLS([basename(char *), ffs, asprintf, vasprintf, snprintf, vsnprintf, strtol, strtoul, strtoll, strtoull]) + AC_CHECK_DECLS([basename(char *), ffs, asprintf, vasprintf, snprintf, vsnprintf, strtol, strtoul, strtoll, strtoull, strnlen]) AC_DEFINE(HAVE_SYS_ERRLIST, 1, [Define if you have the sys_errlist variable.]) AC_DEFINE(HAVE_SYS_NERR, 1, [Define if you have the sys_nerr variable.]) AC_DEFINE(HAVE_SYS_SIGLIST, 1, [Define if you have the sys_siglist variable.]) @@ -689,6 +689,7 @@ if test -z "${setobjs}"; then AC_CHECK_DECLS([calloc, getenv, getopt, malloc, realloc, sbrk]) AC_CHECK_DECLS([strtol, strtoul, strtoll, strtoull]) AC_CHECK_DECLS([strverscmp]) + AC_CHECK_DECLS([strnlen]) libiberty_NEED_DECLARATION(canonicalize_file_name) fi -- 2.7.4