aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-25 03:54:15 -04:00
Code Activity

patch 8.2.2104: build problem with Ruby 2.7

Browse Source 
Problem:    Build problem with Ruby 2.7.
Solution:   Adjust function declarations. (Ozaki Kiichi, closes #7430)
This commit is contained in:
Bram Moolenaar
2020-12-06 21:11:31 +01:00
parent 41d6196e30
commit d5a986f460
4 changed files with 24 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/auto/configure vendored
View File

@@ -7617,8 +7617,7 @@ $as_echo "$rubyhdrdir" >&6; }
librubyarg=`$vi_cv_path_ruby -r rbconfig -e "print $ruby_rbconfig.expand($ruby_rbconfig::CONFIG['LIBRUBYARG'])"` librubyarg=`$vi_cv_path_ruby -r rbconfig -e "print $ruby_rbconfig.expand($ruby_rbconfig::CONFIG['LIBRUBYARG'])"`
librubya=`$vi_cv_path_ruby -r rbconfig -e "print $ruby_rbconfig.expand($ruby_rbconfig::CONFIG['LIBRUBY_A'])"` librubya=`$vi_cv_path_ruby -r rbconfig -e "print $ruby_rbconfig.expand($ruby_rbconfig::CONFIG['LIBRUBY_A'])"`
rubylibdir=`$vi_cv_path_ruby -r rbconfig -e "print $ruby_rbconfig.expand($ruby_rbconfig::CONFIG['libdir'])"` rubylibdir=`$vi_cv_path_ruby -r rbconfig -e "print $ruby_rbconfig.expand($ruby_rbconfig::CONFIG['libdir'])"`
if test -f "$rubylibdir/$librubya"; then if test -f "$rubylibdir/$librubya" || expr "$librubyarg" : "-lruby"; then
librubyarg="$librubyarg"
RUBY_LIBS="$RUBY_LIBS -L$rubylibdir" RUBY_LIBS="$RUBY_LIBS -L$rubylibdir"
elif test "$librubyarg" = "libruby.a"; then elif test "$librubyarg" = "libruby.a"; then
librubyarg="-lruby" librubyarg="-lruby"

3
src/configure.ac
View File

@@ -1965,8 +1965,7 @@ if test "$enable_rubyinterp" = "yes" -o "$enable_rubyinterp" = "dynamic"; then
librubyarg=`$vi_cv_path_ruby -r rbconfig -e "print $ruby_rbconfig.expand($ruby_rbconfig::CONFIG[['LIBRUBYARG']])"` librubyarg=`$vi_cv_path_ruby -r rbconfig -e "print $ruby_rbconfig.expand($ruby_rbconfig::CONFIG[['LIBRUBYARG']])"`
librubya=`$vi_cv_path_ruby -r rbconfig -e "print $ruby_rbconfig.expand($ruby_rbconfig::CONFIG[['LIBRUBY_A']])"` librubya=`$vi_cv_path_ruby -r rbconfig -e "print $ruby_rbconfig.expand($ruby_rbconfig::CONFIG[['LIBRUBY_A']])"`
rubylibdir=`$vi_cv_path_ruby -r rbconfig -e "print $ruby_rbconfig.expand($ruby_rbconfig::CONFIG[['libdir']])"` rubylibdir=`$vi_cv_path_ruby -r rbconfig -e "print $ruby_rbconfig.expand($ruby_rbconfig::CONFIG[['libdir']])"`
if test -f "$rubylibdir/$librubya"; then if test -f "$rubylibdir/$librubya" || expr "$librubyarg" : "-lruby"; then
librubyarg="$librubyarg"
RUBY_LIBS="$RUBY_LIBS -L$rubylibdir" RUBY_LIBS="$RUBY_LIBS -L$rubylibdir"
elif test "$librubyarg" = "libruby.a"; then elif test "$librubyarg" = "libruby.a"; then
dnl required on Mac OS 10.3 where libruby.a doesn't exist dnl required on Mac OS 10.3 where libruby.a doesn't exist

28
src/if_ruby.c
View File

@@ -1300,13 +1300,19 @@ vim_blob(VALUE self UNUSED, VALUE str)
} }
static VALUE static VALUE
buffer_s_current(void) buffer_s_current(VALUE self UNUSED)
{ {
return buffer_new(curbuf); return buffer_new(curbuf);
} }
static VALUE static VALUE
buffer_s_count(void) buffer_s_current_getter(ID id UNUSED, VALUE *x UNUSED)
{
return buffer_new(curbuf);
}
static VALUE
buffer_s_count(VALUE self UNUSED)
{ {
buf_T *b; buf_T *b;
int n = 0; int n = 0;
@@ -1566,7 +1572,13 @@ get_win(VALUE obj)
} }
static VALUE static VALUE
window_s_current(void) window_s_current(VALUE self UNUSED)
{
return window_new(curwin);
}
static VALUE
window_s_current_getter(ID id UNUSED, VALUE *x UNUSED)
{ {
return window_new(curwin); return window_new(curwin);
} }
@@ -1576,7 +1588,7 @@ window_s_current(void)
* SegPhault - 03/07/05 * SegPhault - 03/07/05
*/ */
static VALUE static VALUE
line_s_current(void) line_s_current(VALUE self UNUSED)
{ {
return get_buffer_line(curbuf, curwin->w_cursor.lnum); return get_buffer_line(curbuf, curwin->w_cursor.lnum);
} }
@@ -1588,13 +1600,13 @@ set_current_line(VALUE self UNUSED, VALUE str)
} }
static VALUE static VALUE
current_line_number(void) current_line_number(VALUE self UNUSED)
{ {
return INT2FIX((int)curwin->w_cursor.lnum); return INT2FIX((int)curwin->w_cursor.lnum);
} }
static VALUE static VALUE
window_s_count(void) window_s_count(VALUE self UNUSED)
{ {
win_T *w; win_T *w;
int n = 0; int n = 0;
@@ -1794,8 +1806,8 @@ ruby_vim_init(void)
rb_define_method(cVimWindow, "cursor", window_cursor, 0); rb_define_method(cVimWindow, "cursor", window_cursor, 0);
rb_define_method(cVimWindow, "cursor=", window_set_cursor, 1); rb_define_method(cVimWindow, "cursor=", window_set_cursor, 1);
rb_define_virtual_variable("$curbuf", buffer_s_current, 0); rb_define_virtual_variable("$curbuf", buffer_s_current_getter, 0);
rb_define_virtual_variable("$curwin", window_s_current, 0); rb_define_virtual_variable("$curwin", window_s_current_getter, 0);
} }
void void

2
src/version.c
View File

@@ -750,6 +750,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
2104,
/**/ /**/
2103, 2103,
/**/ /**/