From db20df23004ce949cb3e85460832561b4b0aa854 Mon Sep 17 00:00:00 2001 From: Michael Jerris Date: Fri, 9 Nov 2012 09:27:47 -0500 Subject: [PATCH] FS-4817: --resolve netbsd portability fixes --- libs/libedit/src/unvis.c | 2 +- libs/libedit/src/vi.c | 4 ++-- libs/libedit/src/vis.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libs/libedit/src/unvis.c b/libs/libedit/src/unvis.c index 5b22184c9c..3d71f6f227 100644 --- a/libs/libedit/src/unvis.c +++ b/libs/libedit/src/unvis.c @@ -45,7 +45,7 @@ __RCSID("$NetBSD: unvis.c,v 1.28 2005/09/13 01:44:09 christos Exp $"); #include #include -#if defined(__weak_reference) && !defined(__FreeBSD__) +#if defined(__weak_reference) && !defined(__FreeBSD__) && !defined(__NetBSD__) __weak_alias(strunvis,_strunvis) #endif diff --git a/libs/libedit/src/vi.c b/libs/libedit/src/vi.c index bb408d329c..f09ba6c1ce 100644 --- a/libs/libedit/src/vi.c +++ b/libs/libedit/src/vi.c @@ -915,14 +915,14 @@ vi_comment_out(EditLine *el, int c) * NB: posix implies that we should enter insert mode, however * this is against historical precedent... */ -#if defined(__weak_reference) && !defined(__FreeBSD__) +#if defined(__weak_reference) && !defined(__FreeBSD__) && !defined(__NetBSD__) extern char *get_alias_text(const char *) __weak_reference(get_alias_text); #endif protected el_action_t /*ARGSUSED*/ vi_alias(EditLine *el, int c) { -#if defined(__weak_reference) && !defined(__FreeBSD__) +#if defined(__weak_reference) && !defined(__FreeBSD__) && !defined(__NetBSD__) char alias_name[3]; char *alias_text; diff --git a/libs/libedit/src/vis.c b/libs/libedit/src/vis.c index b37f7141e3..673caa9a15 100644 --- a/libs/libedit/src/vis.c +++ b/libs/libedit/src/vis.c @@ -88,7 +88,7 @@ __RCSID("$NetBSD: vis.c,v 1.35 2006/08/28 20:42:12 christos Exp $"); #include #include -#if defined(__weak_reference) && !defined(__FreeBSD__) +#if defined(__weak_reference) && !defined(__FreeBSD__) && !defined(__NetBSD__) __weak_alias(strsvis,_strsvis) __weak_alias(strsvisx,_strsvisx) __weak_alias(strvis,_strvis)