Fix incorrect declaration for strl* and avoid re-defining CPP macros.

This fixes compiler warnings and lets this build with -Werror.  This
fixes the build on NetBSD.

Commit approved during the deep freeze by <agc>.

4 files changed, 40 insertions, 1 deletions

diff --git a/devel/error/distinfo b/devel/error/distinfo
index 1fa8f76b016..4cd0e207fac 100644
--- a/devel/error/distinfo
+++ b/devel/error/distinfo
@@ -1,5 +1,8 @@
-$NetBSD: distinfo,v 1.1 2005/05/10 21:02:42 christos Exp $
+$NetBSD: distinfo,v 1.2 2005/06/21 21:02:16 jlam Exp $
 
 SHA1 (error-0.0.tar.gz) = b791825e6864e9459401d2bc780521a7411f1ce2
 RMD160 (error-0.0.tar.gz) = 8546498a08045c44eb1a5693447954640d2bf9e4
 Size (error-0.0.tar.gz) = 25818 bytes
+SHA1 (patch-aa) = 8a5addfb206d969b8cf5d2ff8b1505f28d499f02
+SHA1 (patch-ab) = bb50e813ff1730d79d87b629144674795cae58f2
+SHA1 (patch-ac) = d53fd3b4c241bfc254e21d1ab9abaa99712ba404
diff --git a/devel/error/patches/patch-aa b/devel/error/patches/patch-aa
new file mode 100644
index 00000000000..9ef8974415f
--- /dev/null
+++ b/devel/error/patches/patch-aa
@@ -0,0 +1,12 @@
+$NetBSD: patch-aa,v 1.1 2005/06/21 21:02:16 jlam Exp $
+
+--- error.h.orig	2005-05-10 16:48:24.000000000 -0400
++++ error.h
+@@ -248,5 +248,5 @@ char  **wordvsplice(int, int, char **);
+ boolean	writetouched(int);
+ 
+ extern char *fgetln(FILE *, size_t*);
+-extern ssize_t strlcpy(char *, const char *, size_t);
+-extern ssize_t strlcat(char *, const char *, size_t);
++extern size_t strlcpy(char *, const char *, size_t);
++extern size_t strlcat(char *, const char *, size_t);
diff --git a/devel/error/patches/patch-ab b/devel/error/patches/patch-ab
new file mode 100644
index 00000000000..eb26b186ca8
--- /dev/null
+++ b/devel/error/patches/patch-ab
@@ -0,0 +1,12 @@
+$NetBSD: patch-ab,v 1.1 2005/06/21 21:02:16 jlam Exp $
+
+--- strlcat.c.orig	2005-05-10 16:48:24.000000000 -0400
++++ strlcat.c
+@@ -35,6 +35,7 @@ __RCSID("$NetBSD: strlcat.c,v 1.16 2003/
+ 
+ size_t
+ strlcat(char *dst, const char *src, size_t siz);
++#undef _DIAGASSERT
+ #define _DIAGASSERT(a)
+ 
+ #ifdef _LIBC
diff --git a/devel/error/patches/patch-ac b/devel/error/patches/patch-ac
new file mode 100644
index 00000000000..11a544d113b
--- /dev/null
+++ b/devel/error/patches/patch-ac
@@ -0,0 +1,12 @@
+$NetBSD: patch-ac,v 1.1 2005/06/21 21:02:16 jlam Exp $
+
+--- strlcpy.c.orig	2005-05-10 16:48:24.000000000 -0400
++++ strlcpy.c
+@@ -34,6 +34,7 @@ __RCSID("$NetBSD: strlcpy.c,v 1.14 2003/
+ #include <string.h>
+ size_t
+ strlcpy(char *dst, const char *src, size_t siz);
++#undef _DIAGASSERT
+ #define _DIAGASSERT(a)
+ 
+ #ifdef _LIBC