Module Name: src
Committed By: kamil
Date: Sun Jul 26 14:01:53 UTC 2015
Modified Files:
src/tools/compat: Makefile compat_defs.h configure configure.ac
nbtool_config.h.in
Log Message:
Add reallocarr(3) to tools/compat
This should unbreak libutil(3) creation on systems withot reallocarr(3).
To generate a diff of this commit:
cvs rdiff -u -r1.73 -r1.74 src/tools/compat/Makefile
cvs rdiff -u -r1.101 -r1.102 src/tools/compat/compat_defs.h
cvs rdiff -u -r1.82 -r1.83 src/tools/compat/configure
cvs rdiff -u -r1.83 -r1.84 src/tools/compat/configure.ac
cvs rdiff -u -r1.36 -r1.37 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/Makefile
diff -u src/tools/compat/Makefile:1.73 src/tools/compat/Makefile:1.74
--- src/tools/compat/Makefile:1.73 Sun Jan 18 18:09:10 2015
+++ src/tools/compat/Makefile Sun Jul 26 14:01:53 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.73 2015/01/18 18:09:10 christos Exp $
+# $NetBSD: Makefile,v 1.74 2015/07/26 14:01:53 kamil Exp $
HOSTLIB= nbcompat
@@ -13,7 +13,7 @@ SRCS= atoll.c basename.c cdbr.c cdbw.c
mi_vector_hash.c mkdtemp.c \
mkstemp.c pread.c putc_unlocked.c pwcache.c pwrite.c \
pw_scan.c \
- raise_default_signal.c rmd160.c rmd160hl.c \
+ raise_default_signal.c reallocarr.c rmd160.c rmd160hl.c \
setenv.c setgroupent.c \
setpassent.c setprogname.c sha1.c sha1hl.c sha2.c \
sha256hl.c sha384hl.c sha512hl.c snprintb.c snprintf.c \
Index: src/tools/compat/compat_defs.h
diff -u src/tools/compat/compat_defs.h:1.101 src/tools/compat/compat_defs.h:1.102
--- src/tools/compat/compat_defs.h:1.101 Fri Jan 16 18:44:06 2015
+++ src/tools/compat/compat_defs.h Sun Jul 26 14:01:53 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: compat_defs.h,v 1.101 2015/01/16 18:44:06 christos Exp $ */
+/* $NetBSD: compat_defs.h,v 1.102 2015/07/26 14:01:53 kamil Exp $ */
#ifndef __NETBSD_COMPAT_DEFS_H__
#define __NETBSD_COMPAT_DEFS_H__
@@ -469,6 +469,10 @@ ssize_t pwrite(int, const void *, size_t
int raise_default_signal(int);
#endif
+#if !HAVE_REALLOCARR
+int reallocarr(void *, size_t, size_t);
+#endif
+
#if !HAVE_SETENV
int setenv(const char *, const char *, int);
#endif
Index: src/tools/compat/configure
diff -u src/tools/compat/configure:1.82 src/tools/compat/configure:1.83
--- src/tools/compat/configure:1.82 Fri Jan 16 18:44:31 2015
+++ src/tools/compat/configure Sun Jul 26 14:01:53 2015
@@ -5044,7 +5044,7 @@ for ac_func in atoll asprintf asnprintf
getopt getopt_long group_from_gid gid_from_group \
heapsort isblank issetugid lchflags lchmod lchown lutimes mkstemp \
mkdtemp poll pread putc_unlocked pwcache_userdb pwcache_groupdb \
- pwrite raise_default_signal random setenv \
+ pwrite raise_default_signal random reallocarr setenv \
setgroupent setprogname setpassent \
snprintb_m snprintf strlcat strlcpy strmode \
strndup strnlen strsep strsuftoll strtoi strtoll strtou \
Index: src/tools/compat/configure.ac
diff -u src/tools/compat/configure.ac:1.83 src/tools/compat/configure.ac:1.84
--- src/tools/compat/configure.ac:1.83 Fri Jan 16 18:44:06 2015
+++ src/tools/compat/configure.ac Sun Jul 26 14:01:53 2015
@@ -1,4 +1,4 @@
-# $NetBSD: configure.ac,v 1.83 2015/01/16 18:44:06 christos Exp $
+# $NetBSD: configure.ac,v 1.84 2015/07/26 14:01:53 kamil Exp $
#
# Autoconf definition file for libnbcompat.
#
@@ -157,7 +157,7 @@ AC_CHECK_FUNCS(atoll asprintf asnprintf
getopt getopt_long group_from_gid gid_from_group \
heapsort isblank issetugid lchflags lchmod lchown lutimes mkstemp \
mkdtemp poll pread putc_unlocked pwcache_userdb pwcache_groupdb \
- pwrite raise_default_signal random setenv \
+ pwrite raise_default_signal random reallocarr setenv \
setgroupent setprogname setpassent \
snprintb_m snprintf strlcat strlcpy strmode \
strndup strnlen strsep strsuftoll strtoi strtoll strtou \
Index: src/tools/compat/nbtool_config.h.in
diff -u src/tools/compat/nbtool_config.h.in:1.36 src/tools/compat/nbtool_config.h.in:1.37
--- src/tools/compat/nbtool_config.h.in:1.36 Fri Jan 16 18:44:31 2015
+++ src/tools/compat/nbtool_config.h.in Sun Jul 26 14:01:53 2015
@@ -1,6 +1,6 @@
/* nbtool_config.h.in. Generated automatically from configure.ac by autoheader. */
-/* $NetBSD: nbtool_config.h.in,v 1.36 2015/01/16 18:44:31 christos Exp $ */
+/* $NetBSD: nbtool_config.h.in,v 1.37 2015/07/26 14:01:53 kamil Exp $ */
#ifndef __NETBSD_NBTOOL_CONFIG_H__
#define __NETBSD_NBTOOL_CONFIG_H__
@@ -419,6 +419,9 @@
/* Define if you have the `random' function. */
#undef HAVE_RANDOM
+/* Define if you have the `reallocarr' function. */
+#undef HAVE_REALLOCARR
+
/* Define if you have the <resolv.h> header file. */
#undef HAVE_RESOLV_H
