FS-4817: --resolve netbsd portability fixes

diff --git a/libs/libedit/src/unvis.c b/libs/libedit/src/unvis.c
index 5b22184c9c103267948255239f07dd91d7057b30..3d71f6f227436cfb31ad53ad0dbf87b245f09fc5 100644 (file)
--- 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 <stdio.h>
 #include <vis.h>
 
-#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 bb408d329ca913a1943f87c8d13365d2a053e4f5..f09ba6c1ce8ce3abb123215b3fb1894c506f4b9c 100644 (file)
--- 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 b37f7141e3ae28f876f4d9e8227b4c1be4a0d73e..673caa9a159807d8303710836081e09a0d600466 100644 (file)
--- 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 <vis.h>
 #include <stdlib.h>
 
-#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)