summaryrefslogtreecommitdiff
path: root/pkgtools/libnbcompat/files/strlcpy.c
diff options
context:
space:
mode:
Diffstat (limited to 'pkgtools/libnbcompat/files/strlcpy.c')
-rw-r--r--pkgtools/libnbcompat/files/strlcpy.c14
1 files changed, 7 insertions, 7 deletions
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)