summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjoerg <joerg>2008-05-12 15:44:17 +0000
committerjoerg <joerg>2008-05-12 15:44:17 +0000
commit921aa1fff286fb3bf4bb5ec8d75b4174673275a6 (patch)
tree7cf6159a1a011d6a1cad806ac2fe999d8e7ea1ab
parentdfb633f4098fd0649365da806d8a2a7800735c2d (diff)
downloadpkgsrc-921aa1fff286fb3bf4bb5ec8d75b4174673275a6.tar.gz
Separate standard and non-standard headers. Deal with err.h correctly.
-rw-r--r--pkgtools/pkg_install/files/add/perform.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/pkgtools/pkg_install/files/add/perform.c b/pkgtools/pkg_install/files/add/perform.c
index 7509bc0e7e9..7f06e0e92b0 100644
--- a/pkgtools/pkg_install/files/add/perform.c
+++ b/pkgtools/pkg_install/files/add/perform.c
@@ -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>
@@ -41,14 +41,17 @@ __RCSID("$NetBSD: perform.c,v 1.70.4.3 2008/05/12 14:37:50 joerg Exp $");
*/
#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"