[pkgsrc/pkg_install-renovation]: pkgsrc/pkgtools/pkg_install/files/add Separa...

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/0f296cbda2eb
branches:  pkg_install-renovation
changeset: 541541:0f296cbda2eb
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Mon May 12 15:44:17 2008 +0000

description:
Separate standard and non-standard headers. Deal with err.h correctly.

diffstat:

 pkgtools/pkg_install/files/add/perform.c |  11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)

diffs (38 lines):

diff -r 4782915af27e -r 0f296cbda2eb pkgtools/pkg_install/files/add/perform.c
--- a/pkgtools/pkg_install/files/add/perform.c  Mon May 12 15:26:10 2008 +0000
+++ b/pkgtools/pkg_install/files/add/perform.c  Mon May 12 15:44:17 2008 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: perform.c,v 1.70.4.3 2008/05/12 14:37:50 joerg Exp $   */
+/*     $NetBSD: perform.c,v 1.70.4.4 2008/05/12 15:44:17 joerg Exp $   */
 #if HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -6,7 +6,7 @@
 #if HAVE_SYS_CDEFS_H
 #include <sys/cdefs.h>
 #endif
-__RCSID("$NetBSD: perform.c,v 1.70.4.3 2008/05/12 14:37:50 joerg Exp $");
+__RCSID("$NetBSD: perform.c,v 1.70.4.4 2008/05/12 15:44:17 joerg Exp $");
 
 /*-
  * Copyright (c) 2003 Grant Beattie <grant%NetBSD.org@localhost>
@@ -41,14 +41,17 @@
  */
 
 #include <sys/utsname.h>
-#include <archive.h>
-#include <archive_entry.h>
+#if HAVE_ERR_H
 #include <err.h>
+#endif
 #include <errno.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 
+#include <archive.h>
+#include <archive_entry.h>
+
 #include "lib.h"
 #include "add.h"