Mercurial > hg > octave-nkf
changeset 3520:b153b9fa7f1a
[project @ 2000-02-02 06:04:27 by jwe]
author | jwe |
---|---|
date | Wed, 02 Feb 2000 06:16:04 +0000 |
parents | 957d7d6ab0e0 |
children | 2405b732be40 |
files | liboctave/DASSL.cc liboctave/cmd-edit.cc liboctave/oct-rl-edit.c liboctave/oct-rl-hist.c |
diffstat | 4 files changed, 13 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/liboctave/DASSL.cc +++ b/liboctave/DASSL.cc @@ -119,10 +119,10 @@ } void -DASSL::set_stop_time (double t) +DASSL::set_stop_time (double tt) { stop_time_set = 1; - stop_time = t; + stop_time = tt; } void
--- a/liboctave/cmd-edit.cc +++ b/liboctave/cmd-edit.cc @@ -139,7 +139,7 @@ // XXX FIXME XXX -- need interface to rl_add_defun, rl_initialize, and // a function to set rl_terminal_name - string term = octave_env::getenv ("TERM"); + std::string term = octave_env::getenv ("TERM"); octave_rl_set_terminal_name (term.c_str ());
--- a/liboctave/oct-rl-edit.c +++ b/liboctave/oct-rl-edit.c @@ -33,7 +33,7 @@ #include "oct-rl-edit.h" -// It would be nice if readline.h declared these, I think. +/* It would be nice if readline.h declared these, I think. */ extern int rl_blink_matching_paren; @@ -203,25 +203,27 @@ void octave_rl_set_startup_hook (rl_startup_hook_fcn_ptr f) { - rl_startup_hook = (void *) f; + rl_startup_hook_fcn_ptr fp = (rl_startup_hook_fcn_ptr) rl_startup_hook; + fp = (rl_startup_hook_fcn_ptr) f; } rl_startup_hook_fcn_ptr octave_rl_get_startup_hook (void) { - return (void *) rl_startup_hook; + return (rl_startup_hook_fcn_ptr) rl_startup_hook; } void octave_rl_set_event_hook (rl_event_hook_fcn_ptr f) { - rl_event_hook = (void *) f; + rl_event_hook_fcn_ptr fp = (rl_event_hook_fcn_ptr) rl_event_hook; + fp = (rl_event_hook_fcn_ptr) f; } rl_event_hook_fcn_ptr octave_rl_get_event_hook (void) { - return (void *) rl_event_hook; + return (rl_event_hook_fcn_ptr) rl_event_hook; } char **
--- a/liboctave/oct-rl-hist.c +++ b/liboctave/oct-rl-hist.c @@ -34,7 +34,7 @@ void octave_add_history (const char *line) { - return add_history (line); + add_history (line); } int @@ -64,7 +64,7 @@ void octave_stifle_history (int n) { - return stifle_history (n); + stifle_history (n); } int @@ -94,7 +94,7 @@ void octave_using_history (void) { - return using_history (); + using_history (); } int