From bc6e20f014ff0864c79921f9f2e0b598aa01eaa9 Mon Sep 17 00:00:00 2001 From: Stefan Farfeleder Date: Tue, 4 Oct 2005 21:45:42 +0000 Subject: [PATCH] Merge NetBSD's rev. 1.41: PR/31012: Barry Naujok: libedit el_get with EL_EDITOR op does not work Fixed as suggested. --- lib/libedit/el.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/libedit/el.c b/lib/libedit/el.c index e06628e58476..4da311387852 100644 --- a/lib/libedit/el.c +++ b/lib/libedit/el.c @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $NetBSD: el.c,v 1.40 2005/08/01 23:00:15 christos Exp $ + * $NetBSD: el.c,v 1.41 2005/08/19 04:21:47 christos Exp $ */ #if !defined(lint) && !defined(SCCSID) @@ -301,11 +301,11 @@ el_get(EditLine *el, int op, void *ret) switch (op) { case EL_PROMPT: case EL_RPROMPT: - rv = prompt_get(el, (void *) &ret, op); + rv = prompt_get(el, (el_pfunc_t *) ret, op); break; case EL_EDITOR: - rv = map_get_editor(el, (void *) &ret); + rv = map_get_editor(el, (const char **)ret); break; case EL_SIGNAL: