Portability fix, use err.h from libnbcompat.

9 files changed, 26 insertions, 19 deletions

diff --git a/pkgtools/cwrappers/files/bin/alloc.c b/pkgtools/cwrappers/files/bin/alloc.c
index 9e35173f7bb..1d8761c760a 100644
--- a/pkgtools/cwrappers/files/bin/alloc.c
+++ b/pkgtools/cwrappers/files/bin/alloc.c
@@ -1,4 +1,4 @@
-/* $NetBSD: alloc.c,v 1.1 2014/09/17 12:40:56 joerg Exp $ */
+/* $NetBSD: alloc.c,v 1.2 2015/04/19 14:30:07 jperkin Exp $ */
 
 /*-
  * Copyright (c) 2007 Joerg Sonnenberger <joerg@NetBSD.org>.
@@ -31,7 +31,8 @@
  * SUCH DAMAGE.
  */
 
-#include <err.h>
+#include <nbcompat.h>
+#include <nbcompat/err.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/pkgtools/cwrappers/files/bin/base-wrapper.c b/pkgtools/cwrappers/files/bin/base-wrapper.c
index ac04d776b35..6e0d9d018ea 100644
--- a/pkgtools/cwrappers/files/bin/base-wrapper.c
+++ b/pkgtools/cwrappers/files/bin/base-wrapper.c
@@ -1,4 +1,4 @@
-/* $NetBSD: base-wrapper.c,v 1.1 2014/09/17 12:40:56 joerg Exp $ */
+/* $NetBSD: base-wrapper.c,v 1.2 2015/04/19 14:30:07 jperkin Exp $ */
 
 /*-
  * Copyright (c) 2007 Joerg Sonnenberger <joerg@NetBSD.org>.
@@ -31,8 +31,9 @@
  * SUCH DAMAGE.
  */
 
+#include <nbcompat.h>
 #include <sys/wait.h>
-#include <err.h>
+#include <nbcompat/err.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/pkgtools/cwrappers/files/bin/cleanup-cc.c b/pkgtools/cwrappers/files/bin/cleanup-cc.c
index 515949b370c..65e2417df3e 100644
--- a/pkgtools/cwrappers/files/bin/cleanup-cc.c
+++ b/pkgtools/cwrappers/files/bin/cleanup-cc.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cleanup-cc.c,v 1.1 2014/09/17 12:40:56 joerg Exp $ */
+/* $NetBSD: cleanup-cc.c,v 1.2 2015/04/19 14:30:07 jperkin Exp $ */
 
 /*-
  * Copyright (c) 2009 Joerg Sonnenberger <joerg@NetBSD.org>.
@@ -30,7 +30,8 @@
  */
 
 
-#include <err.h>
+#include <nbcompat.h>
+#include <nbcompat/err.h>
 #include <stdlib.h>
 #include <string.h>
 #include "common.h"
diff --git a/pkgtools/cwrappers/files/bin/fixup-libtool.c b/pkgtools/cwrappers/files/bin/fixup-libtool.c
index 2cd61b6944c..13869d71789 100644
--- a/pkgtools/cwrappers/files/bin/fixup-libtool.c
+++ b/pkgtools/cwrappers/files/bin/fixup-libtool.c
@@ -1,4 +1,4 @@
-/* $NetBSD: fixup-libtool.c,v 1.6 2015/04/19 13:30:35 tnn Exp $ */
+/* $NetBSD: fixup-libtool.c,v 1.7 2015/04/19 14:30:07 jperkin Exp $ */
 
 /*-
  * Copyright (c) 2009 Joerg Sonnenberger <joerg@NetBSD.org>.
@@ -32,7 +32,7 @@
 #include <nbcompat.h>
 #include <nbcompat/stdio.h>
 #include <sys/stat.h>
-#include <err.h>
+#include <nbcompat/err.h>
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/pkgtools/cwrappers/files/bin/generic-transform-cc.c b/pkgtools/cwrappers/files/bin/generic-transform-cc.c
index 1452abd8385..5897df85fa5 100644
--- a/pkgtools/cwrappers/files/bin/generic-transform-cc.c
+++ b/pkgtools/cwrappers/files/bin/generic-transform-cc.c
@@ -1,4 +1,4 @@
-/* $NetBSD: generic-transform-cc.c,v 1.2 2015/03/15 19:16:45 joerg Exp $ */
+/* $NetBSD: generic-transform-cc.c,v 1.3 2015/04/19 14:30:07 jperkin Exp $ */
 
 /*-
  * Copyright (c) 2009 Joerg Sonnenberger <joerg@NetBSD.org>.
@@ -33,7 +33,8 @@
 #include <sys/stat.h>
 #endif
 
-#include <err.h>
+#include <nbcompat.h>
+#include <nbcompat/err.h>
 #include <stdlib.h>
 #include <string.h>
 #include "common.h"
diff --git a/pkgtools/cwrappers/files/bin/normalise-cc.c b/pkgtools/cwrappers/files/bin/normalise-cc.c
index ac2b773e0e5..39b05839664 100644
--- a/pkgtools/cwrappers/files/bin/normalise-cc.c
+++ b/pkgtools/cwrappers/files/bin/normalise-cc.c
@@ -1,4 +1,4 @@
-/* $NetBSD: normalise-cc.c,v 1.1 2014/09/17 12:40:56 joerg Exp $ */
+/* $NetBSD: normalise-cc.c,v 1.2 2015/04/19 14:30:07 jperkin Exp $ */
 
 /*-
  * Copyright (c) 2009 Joerg Sonnenberger <joerg@NetBSD.org>.
@@ -30,7 +30,8 @@
  */
 
 
-#include <err.h>
+#include <nbcompat.h>
+#include <nbcompat/err.h>
 #include <stdlib.h>
 #include <string.h>
 #include "common.h"
diff --git a/pkgtools/cwrappers/files/bin/normalise-ld.c b/pkgtools/cwrappers/files/bin/normalise-ld.c
index fbb6617e2d2..aefcad07e5d 100644
--- a/pkgtools/cwrappers/files/bin/normalise-ld.c
+++ b/pkgtools/cwrappers/files/bin/normalise-ld.c
@@ -1,4 +1,4 @@
-/* $NetBSD: normalise-ld.c,v 1.1 2014/09/17 12:40:56 joerg Exp $ */
+/* $NetBSD: normalise-ld.c,v 1.2 2015/04/19 14:30:07 jperkin Exp $ */
 
 /*-
  * Copyright (c) 2009 Joerg Sonnenberger <joerg@NetBSD.org>.
@@ -29,8 +29,8 @@
  * SUCH DAMAGE.
  */
 
-
-#include <err.h>
+#include <nbcompat.h>
+#include <nbcompat/err.h>
 #include <stdlib.h>
 #include <string.h>
 #include "common.h"
diff --git a/pkgtools/cwrappers/files/bin/reorder-cc.c b/pkgtools/cwrappers/files/bin/reorder-cc.c
index a608d9b2b76..eaf086e6e4a 100644
--- a/pkgtools/cwrappers/files/bin/reorder-cc.c
+++ b/pkgtools/cwrappers/files/bin/reorder-cc.c
@@ -1,4 +1,4 @@
-/* $NetBSD: reorder-cc.c,v 1.1 2014/09/17 12:40:56 joerg Exp $ */
+/* $NetBSD: reorder-cc.c,v 1.2 2015/04/19 14:30:07 jperkin Exp $ */
 
 /*-
  * Copyright (c) 2009 Joerg Sonnenberger <joerg@NetBSD.org>.
@@ -29,7 +29,8 @@
  * SUCH DAMAGE.
  */
 
-#include <err.h>
+#include <nbcompat.h>
+#include <nbcompat/err.h>
 #include <stdlib.h>
 #include <string.h>
 #include "common.h"
diff --git a/pkgtools/cwrappers/files/bin/transform-cc.c b/pkgtools/cwrappers/files/bin/transform-cc.c
index 3d7cd027dcf..eb0a74898d9 100644
--- a/pkgtools/cwrappers/files/bin/transform-cc.c
+++ b/pkgtools/cwrappers/files/bin/transform-cc.c
@@ -1,4 +1,4 @@
-/* $NetBSD: transform-cc.c,v 1.1 2014/09/17 12:40:56 joerg Exp $ */
+/* $NetBSD: transform-cc.c,v 1.2 2015/04/19 14:30:07 jperkin Exp $ */
 
 /*-
  * Copyright (c) 2009 Joerg Sonnenberger <joerg@NetBSD.org>.
@@ -29,7 +29,8 @@
  * SUCH DAMAGE.
  */
 
-#include <err.h>
+#include <nbcompat.h>
+#include <nbcompat/err.h>
 #include <string.h>
 #include "common.h"