[src/netbsd-3]: src/usr.sbin/pkg_install/lib Pull up following revision(s) (r...

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

details:   https://anonhg.NetBSD.org/src/rev/40c68bd978f9
branches:  netbsd-3
changeset: 577455:40c68bd978f9
user:      tron <tron%NetBSD.org@localhost>
date:      Sun Nov 06 13:44:58 2005 +0000

description:
Pull up following revision(s) (requested by wiz in ticket #938):
        usr.sbin/pkg_install/lib/var.c: revision 1.3
        usr.sbin/pkg_install/lib/automatic.c: revision 1.2
Use config.h and add appropriate #if HAVE_FOO_H.

diffstat:

 usr.sbin/pkg_install/lib/automatic.c |  22 ++++++++++++++++++++--
 usr.sbin/pkg_install/lib/var.c       |  18 ++++++++++++++++--
 2 files changed, 36 insertions(+), 4 deletions(-)

diffs (86 lines):

diff -r 2abd33388334 -r 40c68bd978f9 usr.sbin/pkg_install/lib/automatic.c
--- a/usr.sbin/pkg_install/lib/automatic.c      Sun Nov 06 13:43:17 2005 +0000
+++ b/usr.sbin/pkg_install/lib/automatic.c      Sun Nov 06 13:44:58 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: automatic.c,v 1.2.2.2 2005/11/06 13:40:51 tron Exp $   */
+/*     $NetBSD: automatic.c,v 1.2.2.3 2005/11/06 13:44:58 tron Exp $   */
 
 /*-
  * Copyright (c) 2005 The NetBSD Foundation, Inc.
@@ -32,17 +32,35 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
+#if HAVE_CONFIG_H
+#include "config.h"
+#endif
+#include <nbcompat.h>
+#if HAVE_SYS_CDEFS_H
 #include <sys/cdefs.h>
+#endif
 #ifndef lint
-__RCSID("$NetBSD: automatic.c,v 1.2.2.2 2005/11/06 13:40:51 tron Exp $");
+__RCSID("$NetBSD: automatic.c,v 1.2.2.3 2005/11/06 13:44:58 tron Exp $");
 #endif
 
+#if HAVE_ERR_H
 #include <err.h>
+#endif
+#if HAVE_ERRNO_H
 #include <errno.h>
+#endif
+#if HAVE_FCNTL_H
 #include <fcntl.h>
+#endif
+#if HAVE_STRING_H
 #include <string.h>
+#endif
+#if HAVE_STDLIB_H
 #include <stdlib.h>
+#endif
+#if HAVE_SYS_STAT_H
 #include <sys/stat.h>
+#endif
 #include "lib.h"
 
 Boolean
diff -r 2abd33388334 -r 40c68bd978f9 usr.sbin/pkg_install/lib/var.c
--- a/usr.sbin/pkg_install/lib/var.c    Sun Nov 06 13:43:17 2005 +0000
+++ b/usr.sbin/pkg_install/lib/var.c    Sun Nov 06 13:44:58 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: var.c,v 1.3.2.3 2005/11/06 13:42:12 tron Exp $ */
+/*     $NetBSD: var.c,v 1.3.2.4 2005/11/06 13:44:58 tron Exp $ */
 
 /*-
  * Copyright (c) 2005 The NetBSD Foundation, Inc.
@@ -32,15 +32,29 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
+#if HAVE_CONFIG_H
+#include "config.h"
+#endif
+#include <nbcompat.h>
+#if HAVE_SYS_CDEFS_H
 #include <sys/cdefs.h>
+#endif
 #ifndef lint
-__RCSID("$NetBSD: var.c,v 1.3.2.3 2005/11/06 13:42:12 tron Exp $");
+__RCSID("$NetBSD: var.c,v 1.3.2.4 2005/11/06 13:44:58 tron Exp $");
 #endif
 
+#if HAVE_SYS_STAT_H
 #include <sys/stat.h>
+#endif
+#if HAVE_ERR_H
 #include <err.h>
+#endif
+#if HAVE_ERRNO_H
 #include <errno.h>
+#endif
+#if HAVE_STDIO_H
 #include <stdio.h>
+#endif
 
 #include "lib.h"