aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

updated for version 7.3.974

Browse Source 
Problem:    Can't build with ruby 1.8.5.
Solution:   Only use ruby_init_stack() when RUBY_INIT_STACK is defined.
            (Yukihiro Nakadaira)
This commit is contained in:
Bram Moolenaar 2013-05-20 12:52:29 +02:00
parent ba40447ab1
commit 10f3a79e89
2 changed files with 25 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/if_ruby.c
View File

@ -158,8 +158,10 @@ static void error_print(int);
static void ruby_io_init(void); static void ruby_io_init(void);
static void ruby_vim_init(void); static void ruby_vim_init(void);
#if defined(__ia64) && !defined(ruby_init_stack) #if defined(RUBY19_OR_LATER) || defined(RUBY_INIT_STACK)
# define ruby_init_stack(addr) ruby_init_stack((addr), rb_ia64_bsp()) # if defined(__ia64) && !defined(ruby_init_stack)
# define ruby_init_stack(addr) ruby_init_stack((addr), rb_ia64_bsp())
# endif
#endif #endif
#if defined(DYNAMIC_RUBY) || defined(PROTO) #if defined(DYNAMIC_RUBY) || defined(PROTO)
@ -231,12 +233,14 @@ static void ruby_vim_init(void);
# define rb_float_new dll_rb_float_new # define rb_float_new dll_rb_float_new
# define rb_ary_new dll_rb_ary_new # define rb_ary_new dll_rb_ary_new
# define rb_ary_push dll_rb_ary_push # define rb_ary_push dll_rb_ary_push
# ifdef __ia64 # if defined(RUBY19_OR_LATER) || defined(RUBY_INIT_STACK)
# define rb_ia64_bsp dll_rb_ia64_bsp # ifdef __ia64
# undef ruby_init_stack # define rb_ia64_bsp dll_rb_ia64_bsp
# define ruby_init_stack(addr) dll_ruby_init_stack((addr), rb_ia64_bsp()) # undef ruby_init_stack
# else # define ruby_init_stack(addr) dll_ruby_init_stack((addr), rb_ia64_bsp())
# define ruby_init_stack dll_ruby_init_stack # else
# define ruby_init_stack dll_ruby_init_stack
# endif
# endif # endif
# else # else
# define rb_str2cstr dll_rb_str2cstr # define rb_str2cstr dll_rb_str2cstr
@ -346,11 +350,13 @@ static char * (*dll_rb_string_value_ptr) (volatile VALUE*);
static VALUE (*dll_rb_float_new) (double); static VALUE (*dll_rb_float_new) (double);
static VALUE (*dll_rb_ary_new) (void); static VALUE (*dll_rb_ary_new) (void);
static VALUE (*dll_rb_ary_push) (VALUE, VALUE); static VALUE (*dll_rb_ary_push) (VALUE, VALUE);
# ifdef __ia64 # if defined(RUBY19_OR_LATER) || defined(RUBY_INIT_STACK)
# ifdef __ia64
static void * (*dll_rb_ia64_bsp) (void); static void * (*dll_rb_ia64_bsp) (void);
static void (*dll_ruby_init_stack)(VALUE*, void*); static void (*dll_ruby_init_stack)(VALUE*, void*);
# else # else
static void (*dll_ruby_init_stack)(VALUE*); static void (*dll_ruby_init_stack)(VALUE*);
# endif
# endif # endif
# endif # endif
# ifdef RUBY19_OR_LATER # ifdef RUBY19_OR_LATER
@ -491,10 +497,6 @@ static struct
# endif # endif
# if defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER >= 18 # if defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER >= 18
{"rb_string_value_ptr", (RUBY_PROC*)&dll_rb_string_value_ptr}, {"rb_string_value_ptr", (RUBY_PROC*)&dll_rb_string_value_ptr},
# ifdef __ia64
{"rb_ia64_bsp", (RUBY_PROC*)&dll_rb_ia64_bsp},
# endif
{"ruby_init_stack", (RUBY_PROC*)&dll_ruby_init_stack},
# if DYNAMIC_RUBY_VER <= 19 # if DYNAMIC_RUBY_VER <= 19
{"rb_float_new", (RUBY_PROC*)&dll_rb_float_new}, {"rb_float_new", (RUBY_PROC*)&dll_rb_float_new},
# else # else
@ -512,6 +514,12 @@ static struct
{"rb_sprintf", (RUBY_PROC*)&dll_rb_sprintf}, {"rb_sprintf", (RUBY_PROC*)&dll_rb_sprintf},
{"rb_require", (RUBY_PROC*)&dll_rb_require}, {"rb_require", (RUBY_PROC*)&dll_rb_require},
{"ruby_process_options", (RUBY_PROC*)&dll_ruby_process_options}, {"ruby_process_options", (RUBY_PROC*)&dll_ruby_process_options},
# endif
# if defined(RUBY19_OR_LATER) || defined(RUBY_INIT_STACK)
# ifdef __ia64
{"rb_ia64_bsp", (RUBY_PROC*)&dll_rb_ia64_bsp},
# endif
{"ruby_init_stack", (RUBY_PROC*)&dll_ruby_init_stack},
# endif # endif
{"", NULL}, {"", NULL},
}; };
@ -735,7 +743,7 @@ static int ensure_ruby_initialized(void)
NtInitialize(&argc, &argv); NtInitialize(&argc, &argv);
#endif #endif
{ {
#if defined(RUBY_VERSION) && RUBY_VERSION >= 18 #if defined(RUBY19_OR_LATER) || defined(RUBY_INIT_STACK)
ruby_init_stack(ruby_stack_start); ruby_init_stack(ruby_stack_start);
#endif #endif
ruby_init(); ruby_init();

2
src/version.c
View File

@ -728,6 +728,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 */
/**/
974,
/**/ /**/
973, 973,
/**/ /**/