[前][次][番号順一覧][スレッド一覧]

ruby-changes:17022

From: nobu <ko1@a...>
Date: Tue, 17 Aug 2010 07:50:55 +0900 (JST)
Subject: [ruby-changes:17022] Ruby:r29019 (trunk): Tue Aug 17 07:50:37 2010 Nobuyoshi Nakada <nobu@r...>

nobu	2010-08-17 07:50:40 +0900 (Tue, 17 Aug 2010)

  New Revision: 29019

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=29019

  Log:
    Tue Aug 17 07:50:37 2010  Nobuyoshi Nakada  <nobu@r...>
    
    * ext/readline/extconf.rb: check functions more.
      [ruby-core:31722]

  Modified files:
    trunk/ChangeLog
    trunk/ext/readline/extconf.rb
    trunk/ext/readline/readline.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 29018)
+++ ChangeLog	(revision 29019)
@@ -1,3 +1,8 @@
+Tue Aug 17 07:50:37 2010  Nobuyoshi Nakada  <nobu@r...>
+
+	* ext/readline/extconf.rb: check functions more.
+	  [ruby-core:31722]
+
 Tue Aug 17 07:42:43 2010  Nobuyoshi Nakada  <nobu@r...>
 
 	* string.c (str_make_independent_expand): set capacity properly. a
Index: ext/readline/readline.c
===================================================================
--- ext/readline/readline.c	(revision 29018)
+++ ext/readline/readline.c	(revision 29019)
@@ -108,8 +108,8 @@
 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 @@
     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 */
Index: ext/readline/extconf.rb
===================================================================
--- ext/readline/extconf.rb	(revision 29018)
+++ ext/readline/extconf.rb	(revision 29019)
@@ -52,6 +52,7 @@
   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 @@
 /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")

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]