Module Name: src
Committed By: snj
Date: Sat Feb 3 22:02:02 UTC 2018
Modified Files:
src/tools/compat [netbsd-8]: configure configure.ac nbtool_config.h.in
Log Message:
Pull up following revision(s) (requested by sevan in ticket #435):
tools/compat/configure: revision 1.88 via patch
tools/compat/configure.ac: revision 1.89 via patch
tools/compat/nbtool_config.h.in: revision 1.42
Add asnprintf() to the AC_CHECK_DECLS list.
Resolves conflict when cross compiling on Cygwin the provided implementation
does not get picked up.
Closes PR toolchain/52797
--
regen
To generate a diff of this commit:
cvs rdiff -u -r1.86.6.2 -r1.86.6.3 src/tools/compat/configure
cvs rdiff -u -r1.87.6.2 -r1.87.6.3 src/tools/compat/configure.ac
cvs rdiff -u -r1.40.6.2 -r1.40.6.3 src/tools/compat/nbtool_config.h.in
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tools/compat/configure
diff -u src/tools/compat/configure:1.86.6.2 src/tools/compat/configure:1.86.6.3
--- src/tools/compat/configure:1.86.6.2 Thu Dec 21 23:06:58 2017
+++ src/tools/compat/configure Sat Feb 3 22:02:02 2018
@@ -4520,6 +4520,19 @@ fi
cat >>confdefs.h <<_ACEOF
#define HAVE_DECL_ASPRINTF $ac_have_decl
_ACEOF
+ac_fn_c_check_decl "$LINENO" "asnprintf" "ac_cv_have_decl_asnprintf" "
+#include <stdio.h>
+
+"
+if test "x$ac_cv_have_decl_asnprintf" = xyes; then :
+ ac_have_decl=1
+else
+ ac_have_decl=0
+fi
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_ASNPRINTF $ac_have_decl
+_ACEOF
ac_fn_c_check_decl "$LINENO" "vasprintf" "ac_cv_have_decl_vasprintf" "
#include <stdio.h>
Index: src/tools/compat/configure.ac
diff -u src/tools/compat/configure.ac:1.87.6.2 src/tools/compat/configure.ac:1.87.6.3
--- src/tools/compat/configure.ac:1.87.6.2 Thu Dec 21 23:06:58 2017
+++ src/tools/compat/configure.ac Sat Feb 3 22:02:02 2018
@@ -1,4 +1,4 @@
-# $NetBSD: configure.ac,v 1.87.6.2 2017/12/21 23:06:58 snj Exp $
+# $NetBSD: configure.ac,v 1.87.6.3 2018/02/03 22:02:02 snj Exp $
#
# Autoconf definition file for libnbcompat.
#
@@ -140,7 +140,7 @@ AC_CHECK_MEMBERS(struct statvfs.f_iosize
AC_CHECK_MEMBERS(struct tm.tm_gmtoff,,, [#include <time.h>])
# Global variable decls.
-AC_CHECK_DECLS([asprintf, vasprintf, vasnprintf, vsnprintf, fgetln, fparseln
+AC_CHECK_DECLS([asprintf, asnprintf, vasprintf, vasnprintf, vsnprintf, fgetln, fparseln
getdelim, getline, snprintf],,, [
#include <stdio.h>
])
Index: src/tools/compat/nbtool_config.h.in
diff -u src/tools/compat/nbtool_config.h.in:1.40.6.2 src/tools/compat/nbtool_config.h.in:1.40.6.3
--- src/tools/compat/nbtool_config.h.in:1.40.6.2 Thu Dec 21 23:06:58 2017
+++ src/tools/compat/nbtool_config.h.in Sat Feb 3 22:02:02 2018
@@ -1,6 +1,6 @@
/* nbtool_config.h.in. Generated from configure.ac by autoheader. */
-/* $NetBSD: nbtool_config.h.in,v 1.40.6.2 2017/12/21 23:06:58 snj Exp $ */
+/* $NetBSD: nbtool_config.h.in,v 1.40.6.3 2018/02/03 22:02:02 snj Exp $ */
#ifndef __NETBSD_NBTOOL_CONFIG_H__
#define __NETBSD_NBTOOL_CONFIG_H__
@@ -47,6 +47,10 @@
/* Define to 1 if you have the <ctype.h> header file. */
#undef HAVE_CTYPE_H
+/* Define to 1 if you have the declaration of `asnprintf', and to 0 if you
+ don't. */
+#undef HAVE_DECL_ASNPRINTF
+
/* Define to 1 if you have the declaration of `asprintf', and to 0 if you
don't. */
#undef HAVE_DECL_ASPRINTF
