1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

Tue Aug 17 07:50:37 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>

* ext/readline/extconf.rb: check functions more.
	  [ruby-core:31722]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@29019 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2010-08-16 22:50:40 +00:00
parent 94fc95c8b0
commit 1572070fa0
3 changed files with 11 additions and 2 deletions

View file

@ -1,3 +1,8 @@
Tue Aug 17 07:50:37 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/readline/extconf.rb: check functions more.
[ruby-core:31722]
Tue Aug 17 07:42:43 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
* string.c (str_make_independent_expand): set capacity properly. a

View file

@ -52,6 +52,7 @@ else
end
end
have_readline_func("rl_getc")
have_readline_func("rl_getc_function")
have_readline_func("rl_filename_completion_function")
have_readline_func("rl_username_completion_function")
@ -74,6 +75,7 @@ have_readline_var("rl_point")
/mswin|bccwin|mingw/ !~ RUBY_PLATFORM && have_readline_var("rl_catch_sigwinch")
/mswin|bccwin|mingw/ !~ RUBY_PLATFORM && have_readline_var("rl_catch_signals")
have_readline_func("rl_cleanup_after_signal")
have_readline_func("rl_free_line_state")
have_readline_func("rl_clear_signals")
have_readline_func("rl_set_screen_size")
have_readline_func("rl_get_screen_size")

View file

@ -108,8 +108,8 @@ static char **readline_attempted_completion_function(const char *text,
static VALUE readline_instream;
static ID id_getbyte;
#ifdef HAVE_EDITLINE_READLINE_H
extern int rl_getc(FILE *);
#ifndef HAVE_RL_GETC
#define rl_getc(f) EOF
#endif
static int readline_getc(FILE *);
@ -260,7 +260,9 @@ readline_readline(int argc, VALUE *argv, VALUE self)
if (status) {
#if defined HAVE_RL_CLEANUP_AFTER_SIGNAL
/* restore terminal mode and signal handler*/
#if defined HAVE_RL_FREE_LINE_STATE
rl_free_line_state();
#endif
rl_cleanup_after_signal();
#elif defined HAVE_RL_DEPREP_TERM_FUNCTION
/* restore terminal mode */