summaryrefslogtreecommitdiff
path: root/pkgtools
diff options
context:
space:
mode:
authorgrant <grant@pkgsrc.org>2004-12-04 23:31:40 +0000
committergrant <grant@pkgsrc.org>2004-12-04 23:31:40 +0000
commit991bd4b13de9277c3f9f1764398d3913ca2e5034 (patch)
tree04381b024ec9691ce49418235b0dfd85370aab7c /pkgtools
parent8d435cc43552d5c19d5a25381ee9a8cab7cf8035 (diff)
downloadpkgsrc-991bd4b13de9277c3f9f1764398d3913ca2e5034.tar.gz
re-work workaround for __unvis13 namespace clash by renaming it to
__nbcompat_unvis13. fixes build on older NetBSD and Linux/sparc.
Diffstat (limited to 'pkgtools')
-rw-r--r--pkgtools/libnbcompat/files/unvis.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/pkgtools/libnbcompat/files/unvis.c b/pkgtools/libnbcompat/files/unvis.c
index 5fc9227ee0f..b392309e995 100644
--- a/pkgtools/libnbcompat/files/unvis.c
+++ b/pkgtools/libnbcompat/files/unvis.c
@@ -1,4 +1,4 @@
-/* $NetBSD: unvis.c,v 1.10 2004/12/03 13:19:09 grant Exp $ */
+/* $NetBSD: unvis.c,v 1.11 2004/12/04 23:31:40 grant Exp $ */
/*-
* Copyright (c) 1989, 1993
@@ -35,7 +35,7 @@
#if 0
static char sccsid[] = "@(#)unvis.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: unvis.c,v 1.10 2004/12/03 13:19:09 grant Exp $");
+__RCSID("$NetBSD: unvis.c,v 1.11 2004/12/04 23:31:40 grant Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -89,14 +89,14 @@ unvis(cp, c, astate, flag)
int c;
int *astate, flag;
{
- return __unvis13(cp, (int)c, astate, flag);
+ return __nbcompat_unvis13(cp, (int)c, astate, flag);
}
/*
* unvis - decode characters previously encoded by vis
*/
int
-__unvis13(cp, c, astate, flag)
+__nbcompat_unvis13(cp, c, astate, flag)
char *cp;
int c;
int *astate, flag;
@@ -297,7 +297,7 @@ strunvisx(dst, src, flag)
while ((c = *src++) != '\0') {
again:
- switch (__unvis13(dst, c, &state, flag)) {
+ switch (__nbcompat_unvis13(dst, c, &state, flag)) {
case UNVIS_VALID:
dst++;
break;
@@ -311,7 +311,7 @@ strunvisx(dst, src, flag)
return (-1);
}
}
- if (__unvis13(dst, c, &state, UNVIS_END) == UNVIS_VALID)
+ if (__nbcompat_unvis13(dst, c, &state, UNVIS_END) == UNVIS_VALID)
dst++;
*dst = '\0';
return (dst - start);