diff options
| author | grant <grant@pkgsrc.org> | 2003-09-05 04:38:44 +0000 |
|---|---|---|
| committer | grant <grant@pkgsrc.org> | 2003-09-05 04:38:44 +0000 |
| commit | 26aa7326069d40c7fe72e4b22af478f61cb5d9b7 (patch) | |
| tree | efd3e3c4544334b5cb3cf9762fe0eb128e411e45 /pkgtools/mtree/files/compare.c | |
| parent | 2886f2158a0f6f4b1dfb2b3dcbdd52618e1aa9fa (diff) | |
| download | pkgsrc-26aa7326069d40c7fe72e4b22af478f61cb5d9b7.tar.gz | |
update mtree to 20030905:
* sync with -current
* fixes for libnbcompat new world order
* autoconf and Makefile cleanup
Diffstat (limited to 'pkgtools/mtree/files/compare.c')
| -rw-r--r-- | pkgtools/mtree/files/compare.c | 39 |
1 files changed, 28 insertions, 11 deletions
diff --git a/pkgtools/mtree/files/compare.c b/pkgtools/mtree/files/compare.c index d06c3e5e9eb..0b95b7709e6 100644 --- a/pkgtools/mtree/files/compare.c +++ b/pkgtools/mtree/files/compare.c @@ -1,4 +1,4 @@ -/* $NetBSD: compare.c,v 1.1.1.1 2003/03/31 08:51:09 grant Exp $ */ +/* $NetBSD: compare.c,v 1.2 2003/09/05 04:38:46 grant Exp $ */ /*- * Copyright (c) 1989, 1993 @@ -12,11 +12,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -33,38 +29,59 @@ * SUCH DAMAGE. */ -#include "nbcompat.h" - -#ifdef HAVE_SYS_CDEFS_H +#if HAVE_CONFIG_H +#include "config.h" +#endif +#include <nbcompat.h> +#if HAVE_SYS_CDEFS_H #include <sys/cdefs.h> #endif - #if defined(__RCSID) && !defined(lint) #if 0 static char sccsid[] = "@(#)compare.c 8.1 (Berkeley) 6/6/93"; #else -__RCSID("$NetBSD: compare.c,v 1.1.1.1 2003/03/31 08:51:09 grant Exp $"); +__RCSID("$NetBSD: compare.c,v 1.2 2003/09/05 04:38:46 grant Exp $"); #endif #endif /* not lint */ +#if HAVE_SYS_PARAM_H #include <sys/param.h> +#endif +#if HAVE_ERRNO_H #include <errno.h> +#endif +#if HAVE_FCNTL_H #include <fcntl.h> +#endif +#if HAVE_STDIO_H #include <stdio.h> +#endif +#if HAVE_STRING_H #include <string.h> +#endif +#if HAVE_TIME_H #include <time.h> +#endif +#if HAVE_UNISTD_H #include <unistd.h> +#endif #ifndef NO_MD5 +#if HAVE_MD5_H #include <md5.h> #endif +#endif #ifndef NO_RMD160 +#if HAVE_RMD160_H #include <rmd160.h> #endif +#endif #ifndef NO_SHA1 +#if HAVE_SHA1_H #include <sha1.h> #endif +#endif #include "extern.h" |