pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/pkgtools/libnbcompat/files add workaround for __unvis1...
details: https://anonhg.NetBSD.org/pkgsrc/rev/f5a2fe4bf884
branches: trunk
changeset: 485015:f5a2fe4bf884
user: grant <grant%pkgsrc.org@localhost>
date: Fri Dec 03 00:09:02 2004 +0000
description:
add workaround for __unvis13 symbol clash on NetBSD 1.4.3. bootstrap
now builds successfully on NetBSD 1.4.3.
diffstat:
pkgtools/libnbcompat/files/unvis.c | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diffs (40 lines):
diff -r d4056fc44fca -r f5a2fe4bf884 pkgtools/libnbcompat/files/unvis.c
--- a/pkgtools/libnbcompat/files/unvis.c Thu Dec 02 22:53:58 2004 +0000
+++ b/pkgtools/libnbcompat/files/unvis.c Fri Dec 03 00:09:02 2004 +0000
@@ -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 @@
#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 - 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;
Home |
Main Index |
Thread Index |
Old Index