Module Name: src
Committed By: christos
Date: Wed Oct 19 21:54:20 UTC 2016
Modified Files:
src/tools/compat: compat_defs.h configure.ac
Log Message:
try to fix missing decls
To generate a diff of this commit:
cvs rdiff -u -r1.103 -r1.104 src/tools/compat/compat_defs.h
cvs rdiff -u -r1.84 -r1.85 src/tools/compat/configure.ac
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/compat_defs.h
diff -u src/tools/compat/compat_defs.h:1.103 src/tools/compat/compat_defs.h:1.104
--- src/tools/compat/compat_defs.h:1.103 Mon Sep 21 17:50:16 2015
+++ src/tools/compat/compat_defs.h Wed Oct 19 17:54:20 2016
@@ -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 @@ struct _dirdesc {
#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 @@ int pwcache_groupdb(int (*)(int), void (
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
Index: src/tools/compat/configure.ac
diff -u src/tools/compat/configure.ac:1.84 src/tools/compat/configure.ac:1.85
--- src/tools/compat/configure.ac:1.84 Sun Jul 26 10:01:53 2015
+++ src/tools/compat/configure.ac Wed Oct 19 17:54:20 2016
@@ -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([user_from_uid, uid_from_
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
