patch 8.1.0236: Ruby build fails when ruby_intern is missing
Problem: Ruby build fails when ruby_intern is missing.
Solution: Do not use ruby_intern2. (Ken Takata)
diff --git a/src/if_ruby.c b/src/if_ruby.c
index bf83c8b..63f7312 100644
--- a/src/if_ruby.c
+++ b/src/if_ruby.c
@@ -253,11 +253,12 @@
# define rb_hash_new dll_rb_hash_new
# define rb_inspect dll_rb_inspect
# define rb_int2inum dll_rb_int2inum
-# ifdef RUBY19_OR_LATER
-# define rb_intern2 dll_rb_intern2
-# else
+# ifndef rb_intern
# define rb_intern dll_rb_intern
# endif
+# ifdef RUBY_CONST_ID_CACHE
+# define rb_intern2 dll_rb_intern2
+# endif
# if VIM_SIZEOF_INT < VIM_SIZEOF_LONG /* 64 bits only */
# if defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER <= 18
# define rb_fix2int dll_rb_fix2int
@@ -392,10 +393,9 @@
static VALUE (*dll_rb_hash_new) (void);
static VALUE (*dll_rb_inspect) (VALUE);
static VALUE (*dll_rb_int2inum) (long);
-# ifdef RUBY19_OR_LATER
-static ID (*dll_rb_intern2) (const char*, long);
-# else
static ID (*dll_rb_intern) (const char*);
+# ifdef RUBY_CONST_ID_CACHE
+static ID (*dll_rb_intern2) (const char*, long);
# endif
# if VIM_SIZEOF_INT < VIM_SIZEOF_LONG /* 64 bits only */
static long (*dll_rb_fix2int) (VALUE);
@@ -596,10 +596,9 @@
{"rb_hash_new", (RUBY_PROC*)&dll_rb_hash_new},
{"rb_inspect", (RUBY_PROC*)&dll_rb_inspect},
{"rb_int2inum", (RUBY_PROC*)&dll_rb_int2inum},
-# ifdef RUBY19_OR_LATER
- {"rb_intern2", (RUBY_PROC*)&dll_rb_intern2},
-# else
{"rb_intern", (RUBY_PROC*)&dll_rb_intern},
+# ifdef RUBY_CONST_ID_CACHE
+ {"rb_intern2", (RUBY_PROC*)&dll_rb_intern2},
# endif
# if VIM_SIZEOF_INT < VIM_SIZEOF_LONG /* 64 bits only */
{"rb_fix2int", (RUBY_PROC*)&dll_rb_fix2int},
diff --git a/src/version.c b/src/version.c
index f93e099..ec097fd 100644
--- a/src/version.c
+++ b/src/version.c
@@ -795,6 +795,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 236,
+/**/
235,
/**/
234,