3 files changed, 21 insertions, 21 deletions
diff --git a/pkgtools/libnbcompat/files/strlcat.c b/pkgtools/libnbcompat/files/strlcat.c
index 3bf71b544f1..dd10bb0c77a 100644
--- a/pkgtools/libnbcompat/files/strlcat.c
+++ b/pkgtools/libnbcompat/files/strlcat.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: strlcat.c,v 1.4 2004/08/23 03:32:12 jlam Exp $	*/
+/*	$NetBSD: strlcat.c,v 1.5 2004/08/31 17:55:17 jlam Exp $	*/
 /*	$OpenBSD: strlcat.c,v 1.10 2003/04/12 21:56:39 millert Exp $	*/
 
 /*
@@ -24,25 +24,25 @@
 #include <nbcompat.h>
 #include <nbcompat/cdefs.h>
 #if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: strlcat.c,v 1.4 2004/08/23 03:32:12 jlam Exp $");
+__RCSID("$NetBSD: strlcat.c,v 1.5 2004/08/31 17:55:17 jlam Exp $");
 #endif /* LIBC_SCCS and not lint */
 
-#if 0
 #ifdef _LIBC
-#include "namespace.h"
+#undef _LIBC
 #endif
+
+#ifdef _LIBC
+#include "namespace.h"
 #endif
 #include <nbcompat/types.h>
 #include <nbcompat/assert.h>
 #include <nbcompat/string.h>
 
-#if 0
 #ifdef _LIBC
 # ifdef __weak_alias
 __weak_alias(strlcat, _strlcat)
 # endif
 #endif
-#endif
 
 #if !HAVE_STRLCAT
 /*
@@ -53,7 +53,7 @@ __weak_alias(strlcat, _strlcat)
  * If retval >= siz, truncation occurred.
  */
 size_t
-#ifdef _LIBC && 0
+#ifdef _LIBC
 _strlcat(dst, src, siz)
 #else
 strlcat(dst, src, siz)
diff --git a/pkgtools/libnbcompat/files/strlcpy.c b/pkgtools/libnbcompat/files/strlcpy.c
index f3f5ebf1948..75291bb6826 100644
--- a/pkgtools/libnbcompat/files/strlcpy.c
+++ b/pkgtools/libnbcompat/files/strlcpy.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: strlcpy.c,v 1.4 2004/08/23 03:32:12 jlam Exp $	*/
+/*	$NetBSD: strlcpy.c,v 1.5 2004/08/31 17:55:17 jlam Exp $	*/
 /*	$OpenBSD: strlcpy.c,v 1.7 2003/04/12 21:56:39 millert Exp $	*/
 
 /*
@@ -24,25 +24,25 @@
 #include <nbcompat.h>
 #include <nbcompat/cdefs.h>
 #if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: strlcpy.c,v 1.4 2004/08/23 03:32:12 jlam Exp $");
+__RCSID("$NetBSD: strlcpy.c,v 1.5 2004/08/31 17:55:17 jlam Exp $");
 #endif /* LIBC_SCCS and not lint */
 
-#if 0
 #ifdef _LIBC
-#include "namespace.h"
+#undef _LIBC
 #endif
+
+#ifdef _LIBC
+#include "namespace.h"
 #endif
 #include <nbcompat/types.h>
 #include <nbcompat/assert.h>
 #include <nbcompat/string.h>
 
-#if 0
 #ifdef _LIBC
 # ifdef __weak_alias
 __weak_alias(strlcpy, _strlcpy)
 # endif
 #endif
-#endif
 
 #if !HAVE_STRLCPY
 /*
@@ -51,7 +51,7 @@ __weak_alias(strlcpy, _strlcpy)
  * Returns strlen(src); if retval >= siz, truncation occurred.
  */
 size_t
-#ifdef _LIBC && 0
+#ifdef _LIBC
 _strlcpy(dst, src, siz)
 #else
 strlcpy(dst, src, siz)
diff --git a/pkgtools/libnbcompat/files/strtoll.c b/pkgtools/libnbcompat/files/strtoll.c
index 6a1e279cb2b..799f881aaa8 100644
--- a/pkgtools/libnbcompat/files/strtoll.c
+++ b/pkgtools/libnbcompat/files/strtoll.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: strtoll.c,v 1.6 2004/08/23 03:49:05 jlam Exp $	*/
+/*	$NetBSD: strtoll.c,v 1.7 2004/08/31 17:55:17 jlam Exp $	*/
 
 /*-
  * Copyright (c) 1992, 1993
@@ -39,14 +39,16 @@
 #if 0
 static char sccsid[] = "from: @(#)strtoq.c	8.1 (Berkeley) 6/4/93";
 #else
-__RCSID("$NetBSD: strtoll.c,v 1.6 2004/08/23 03:49:05 jlam Exp $");
+__RCSID("$NetBSD: strtoll.c,v 1.7 2004/08/31 17:55:17 jlam Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */
 
-#if 0
 #ifdef _LIBC
-#include "namespace.h"
+#undef _LIBC
 #endif
+
+#ifdef _LIBC
+#include "namespace.h"
 #endif
 
 #include <nbcompat/assert.h>
@@ -57,13 +59,11 @@ __RCSID("$NetBSD: strtoll.c,v 1.6 2004/08/23 03:49:05 jlam Exp $");
 #include <nbcompat/limits.h>
 #include <nbcompat/stdlib.h>
 
-#if 0
 #ifdef _LIBC
 #ifdef __weak_alias
 __weak_alias(strtoll, _strtoll)
 #endif
 #endif
-#endif
 
 #if !HAVE_STRTOLL
 /*
@@ -74,7 +74,7 @@ __weak_alias(strtoll, _strtoll)
  */
 /* LONGLONG */
 long long int
-#if defined(_LIBC) && 0
+#ifdef _LIBC
 _strtoll(nptr, endptr, base)
 #else
 strtoll(nptr, endptr, base)