summaryrefslogtreecommitdiff
path: root/pkgtools/libnbcompat
diff options
context:
space:
mode:
authorgrant <grant@pkgsrc.org>2004-12-03 00:09:02 +0000
committergrant <grant@pkgsrc.org>2004-12-03 00:09:02 +0000
commit322fb324cd33acf6ff4c62bd11b0673acd660f80 (patch)
tree9504ac0ae9d03fad5c0fcb5613d7fe33e92c0e57 /pkgtools/libnbcompat
parent8886db3cc38741ff06945188bf406ed266a13c5c (diff)
downloadpkgsrc-322fb324cd33acf6ff4c62bd11b0673acd660f80.tar.gz
add workaround for __unvis13 symbol clash on NetBSD 1.4.3. bootstrap
now builds successfully on NetBSD 1.4.3.
Diffstat (limited to 'pkgtools/libnbcompat')
-rw-r--r--pkgtools/libnbcompat/files/unvis.c12
1 files changed, 9 insertions, 3 deletions
diff --git a/pkgtools/libnbcompat/files/unvis.c b/pkgtools/libnbcompat/files/unvis.c
index 92ee99070f5..9632a5162be 100644
--- a/pkgtools/libnbcompat/files/unvis.c
+++ b/pkgtools/libnbcompat/files/unvis.c
@@ -1,4 +1,4 @@
-/* $NetBSD: unvis.c,v 1.7 2004/08/23 03:32:13 jlam Exp $ */
+/* $NetBSD: unvis.c,v 1.8 2004/12/03 00:09:02 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.7 2004/08/23 03:32:13 jlam Exp $");
+__RCSID("$NetBSD: unvis.c,v 1.8 2004/12/03 00:09:02 grant Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -67,6 +67,12 @@ __warn_references(unvis,
#endif
#endif
+/* work around namespace clash with NetBSD 1.4 (and earlier) */
+#ifdef __unvis13
+#undef __unvis13
+#define __unvis13 __nbcompat_unvis13
+#endif
+
/*
* decode driven by state machine
*/
@@ -96,7 +102,7 @@ unvis(cp, 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;