[src/trunk]: src/tools/compat try to fix missing decls

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/256b8a1e8c33
branches:  trunk
changeset: 348474:256b8a1e8c33
user:      christos <christos%NetBSD.org@localhost>
date:      Wed Oct 19 21:54:20 2016 +0000

description:
try to fix missing decls

diffstat:

 tools/compat/compat_defs.h |  39 +++++++++++++++++++++++++++++++--------
 tools/compat/configure.ac  |  10 ++++++----
 2 files changed, 37 insertions(+), 12 deletions(-)

diffs (102 lines):

diff -r b9dcb64d5082 -r 256b8a1e8c33 tools/compat/compat_defs.h
--- a/tools/compat/compat_defs.h        Wed Oct 19 21:27:10 2016 +0000
+++ b/tools/compat/compat_defs.h        Wed Oct 19 21:54:20 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: compat_defs.h,v 1.103 2015/09/21 21:50:16 pooka Exp $  */
+/*     $NetBSD: compat_defs.h,v 1.104 2016/10/19 21:54:20 christos Exp $       */
 
 #ifndef        __NETBSD_COMPAT_DEFS_H__
 #define        __NETBSD_COMPAT_DEFS_H__
@@ -272,26 +272,43 @@
 #endif
 #endif
 
-#if !HAVE_ERR_H
+#if !HAVE_DECL_ERR
 void err(int, const char *, ...);
+#endif
+#if !HAVE_DECL_ERRC
+void errc(int, int, const char *, ...);
+#endif
+#if !HAVE_DECL_ERRX
 void errx(int, const char *, ...);
+#endif
+#if !HAVE_DECL_VERRC
+void verrc(int, int, const char *, va_list);
+#endif
+#if !HAVE_DECL_VERRX
+void verrx(int, const char *, va_list);
+#endif
+#if !HAVE_DECL_WARN
 void warn(const char *, ...);
-void warnx(const char *, ...);
-void vwarnx(const char *, va_list);
 #endif
 #if !HAVE_DECL_WARNC
 void warnc(int, const char *, ...);
 #endif
+#if !HAVE_DECL_WARNX
+void warnx(const char *, ...);
+#endif
 #if !HAVE_DECL_VWARNC
 void vwarnc(int, const char *, va_list);
 #endif
-#if !HAVE_DECL_ERRC
-void errc(int, int, const char *, ...);
+#if !HAVE_DECL_VWARNX
+void vwarnx(const char *, va_list);
 #endif
-#if !HAVE_DECL_VERRC
-void verrc(int, int, const char *, va_list);
+
+#if !HAVE_DECL_MI_VECTOR_HASH
+void     mi_vector_hash(const void * __restrict, size_t, uint32_t,
+    uint32_t[3]);
 #endif
 
+
 #if !HAVE_ESETFUNC
 void (*esetfunc(void (*)(int, const char *, ...)))(int, const char *, ...);
 size_t estrlcpy(char *, const char *, size_t);
@@ -445,6 +462,12 @@
     struct group * (*)(const char *), struct group * (*)(gid_t));
 #endif
 
+#if !HAVE_DECL_STRLCAT
+size_t         strlcat(char *, const char *, size_t);
+#endif
+#if !HAVE_DECL_STRLCPY
+size_t         strlcpy(char *, const char *, size_t);
+#endif
 #if !HAVE_DECL_STRNDUP
 char           *strndup(const char *, size_t);
 #endif
diff -r b9dcb64d5082 -r 256b8a1e8c33 tools/compat/configure.ac
--- a/tools/compat/configure.ac Wed Oct 19 21:27:10 2016 +0000
+++ b/tools/compat/configure.ac Wed Oct 19 21:54:20 2016 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: configure.ac,v 1.84 2015/07/26 14:01:53 kamil Exp $
+#      $NetBSD: configure.ac,v 1.85 2016/10/19 21:54:20 christos Exp $
 #
 # Autoconf definition file for libnbcompat.
 #
@@ -169,14 +169,16 @@
 AC_CHECK_DECLS([group_from_gid, gid_from_group, pwcache_groupdb],,,[
 #include <grp.h>
 ])
-AC_CHECK_DECLS([strndup, strnlen],,,[#include <string.h>])
-AC_CHECK_DECLS([strsuftoll],,,[#include <stdlib.h>])
+AC_CHECK_DECLS([strlcpy, strlcat, strndup, strnlen],,,[
+#include <string.h>
+])
+AC_CHECK_DECLS([strsuftoll, mi_vector_hash],,,[#include <stdlib.h>])
 AC_CHECK_DECLS([lchflags, lchmod, lchown],,,[
 #include <sys/stat.h>
 #include <unistd.h>
 ])
 
-AC_CHECK_DECLS([errc, verrc, warnc, vwarnc],,, [
+AC_CHECK_DECLS([err, errc, errx, verrc, verrx, warn, warnc, warnx, vwarnc, vwarnx],,, [
 #ifdef HAVE_ERR_H
 #include <err.h>
 #endif