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

ruby-changes:64629

From: Nobuyoshi <ko1@a...>
Date: Sun, 27 Dec 2020 20:24:42 +0900 (JST)
Subject: [ruby-changes:64629] 730b0099fd (master): Get rid of inconsistent dll linkages against vcpkg readline

https://git.ruby-lang.org/ruby.git/commit/?id=730b0099fd

From 730b0099fd7b32bf1a79d2a233c327425680a145 Mon Sep 17 00:00:00 2001
From: Nobuyoshi Nakada <nobu@r...>
Date: Sun, 27 Dec 2020 19:35:27 +0900
Subject: Get rid of inconsistent dll linkages against vcpkg readline


diff --git a/ext/readline/readline.c b/ext/readline/readline.c
index ae68cf7..9f76f90 100644
--- a/ext/readline/readline.c
+++ b/ext/readline/readline.c
@@ -78,7 +78,7 @@ static ID id_special_prefixes; https://github.com/ruby/ruby/blob/trunk/ext/readline/readline.c#L78
 #ifndef HAVE_RL_USERNAME_COMPLETION_FUNCTION
 # define rl_username_completion_function username_completion_function
 #else
-char *rl_username_completion_function(const char *, int);
+RUBY_EXTERN char *rl_username_completion_function(const char *, int);
 #endif
 #ifndef HAVE_RL_COMPLETION_MATCHES
 # define rl_completion_matches completion_matches
@@ -689,7 +689,7 @@ readline_s_insert_text(VALUE self, VALUE str) https://github.com/ruby/ruby/blob/trunk/ext/readline/readline.c#L689
 #endif
 
 #if defined(HAVE_RL_DELETE_TEXT)
-int rl_delete_text(int, int);
+RUBY_EXTERN int rl_delete_text(int, int);
 static const char *
 str_subpos(const char *ptr, const char *end, long beg, long *sublen, rb_encoding *enc)
 {
@@ -1148,7 +1148,7 @@ readline_s_get_screen_size(VALUE self) https://github.com/ruby/ruby/blob/trunk/ext/readline/readline.c#L1148
 #endif
 
 #ifdef HAVE_RL_VI_EDITING_MODE
-int rl_vi_editing_mode(int, int);
+RUBY_EXTERN int rl_vi_editing_mode(int, int);
 /*
  * call-seq:
  *   Readline.vi_editing_mode -> nil
@@ -1187,7 +1187,7 @@ readline_s_vi_editing_mode_p(VALUE self) https://github.com/ruby/ruby/blob/trunk/ext/readline/readline.c#L1187
 #endif
 
 #ifdef HAVE_RL_EMACS_EDITING_MODE
-int rl_emacs_editing_mode(int, int);
+RUBY_EXTERN int rl_emacs_editing_mode(int, int);
 /*
  * call-seq:
  *   Readline.emacs_editing_mode -> nil
@@ -1672,7 +1672,7 @@ readline_s_get_filename_quote_characters(VALUE self) https://github.com/ruby/ruby/blob/trunk/ext/readline/readline.c#L1672
 #endif
 
 #ifdef HAVE_RL_REFRESH_LINE
-int rl_refresh_line(int, int);
+RUBY_EXTERN int rl_refresh_line(int, int);
 /*
  * call-seq:
  *   Readline.refresh_line -> nil
@@ -1919,7 +1919,7 @@ username_completion_proc_call(VALUE self, VALUE str) https://github.com/ruby/ruby/blob/trunk/ext/readline/readline.c#L1919
 }
 
 #ifdef HAVE_RL_CLEAR_SIGNALS
-int rl_clear_signals(void);
+RUBY_EXTERN int rl_clear_signals(void);
 #endif
 
 #undef rb_intern
-- 
cgit v0.10.2


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

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