components/vim/patches/if_ruby_c.patch
author April Chin <april.chin@oracle.com>
Fri, 18 Sep 2015 10:23:23 -0700
changeset 4878 a720ef1bf2de
parent 1871 0a2201439908
permissions -rw-r--r--
21234611 vim should not use ruby 1.9
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
1871
0a2201439908 17409417 change vim to use ruby 1.9.3 instead of ruby 1.8.7
April Chin <april.chin@oracle.com>
parents:
diff changeset
     1
# Apply ruby 2.0 fix to ruby 1.9 as well.  Needed to allow
0a2201439908 17409417 change vim to use ruby 1.9.3 instead of ruby 1.8.7
April Chin <april.chin@oracle.com>
parents:
diff changeset
     2
# vim to build with ruby 1.9.
4878
a720ef1bf2de 21234611 vim should not use ruby 1.9
April Chin <april.chin@oracle.com>
parents: 1871
diff changeset
     3
# These changes were applied upstream to vim 7.4.224.  See
1871
0a2201439908 17409417 change vim to use ruby 1.9.3 instead of ruby 1.8.7
April Chin <april.chin@oracle.com>
parents:
diff changeset
     4
# https://groups.google.com/forum/#!msg/vim_dev/r8wzUVNYIfQ/m0DM8Wt97vkJ
0a2201439908 17409417 change vim to use ruby 1.9.3 instead of ruby 1.8.7
April Chin <april.chin@oracle.com>
parents:
diff changeset
     5
4878
a720ef1bf2de 21234611 vim should not use ruby 1.9
April Chin <april.chin@oracle.com>
parents: 1871
diff changeset
     6
# Also applies fixes for Ruby 2.1 
a720ef1bf2de 21234611 vim should not use ruby 1.9
April Chin <april.chin@oracle.com>
parents: 1871
diff changeset
     7
# from vim 7.4.570 
a720ef1bf2de 21234611 vim should not use ruby 1.9
April Chin <april.chin@oracle.com>
parents: 1871
diff changeset
     8
# https://github.com/vim/vim/commit/0c7485fdbb5023731b006572cc224cbf52e34288
a720ef1bf2de 21234611 vim should not use ruby 1.9
April Chin <april.chin@oracle.com>
parents: 1871
diff changeset
     9
# and Ruby 2.2, from fixes to vim 7.4.705
a720ef1bf2de 21234611 vim should not use ruby 1.9
April Chin <april.chin@oracle.com>
parents: 1871
diff changeset
    10
# https://github.com/vim/vim/commit/bbc1a592a0e0efd5101a58032e7e7cc9f3e9f417
a720ef1bf2de 21234611 vim should not use ruby 1.9
April Chin <april.chin@oracle.com>
parents: 1871
diff changeset
    11
a720ef1bf2de 21234611 vim should not use ruby 1.9
April Chin <april.chin@oracle.com>
parents: 1871
diff changeset
    12
--- src/if_ruby.c	2013-08-10 06:00:24.000000000 -0700
a720ef1bf2de 21234611 vim should not use ruby 1.9
April Chin <april.chin@oracle.com>
parents: 1871
diff changeset
    13
+++ src/if_ruby.c	2015-09-16 15:16:02.741823755 -0700
a720ef1bf2de 21234611 vim should not use ruby 1.9
April Chin <april.chin@oracle.com>
parents: 1871
diff changeset
    14
@@ -88,14 +88,24 @@
1871
0a2201439908 17409417 change vim to use ruby 1.9.3 instead of ruby 1.8.7
April Chin <april.chin@oracle.com>
parents:
diff changeset
    15
 # define rb_int2big rb_int2big_stub
0a2201439908 17409417 change vim to use ruby 1.9.3 instead of ruby 1.8.7
April Chin <april.chin@oracle.com>
parents:
diff changeset
    16
 #endif
0a2201439908 17409417 change vim to use ruby 1.9.3 instead of ruby 1.8.7
April Chin <april.chin@oracle.com>
parents:
diff changeset
    17
 
0a2201439908 17409417 change vim to use ruby 1.9.3 instead of ruby 1.8.7
April Chin <april.chin@oracle.com>
parents:
diff changeset
    18
-#if defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER >= 20 \
0a2201439908 17409417 change vim to use ruby 1.9.3 instead of ruby 1.8.7
April Chin <april.chin@oracle.com>
parents:
diff changeset
    19
+#if defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER >= 19 \
0a2201439908 17409417 change vim to use ruby 1.9.3 instead of ruby 1.8.7
April Chin <april.chin@oracle.com>
parents:
diff changeset
    20
 	&& SIZEOF_INT < SIZEOF_LONG
0a2201439908 17409417 change vim to use ruby 1.9.3 instead of ruby 1.8.7
April Chin <april.chin@oracle.com>
parents:
diff changeset
    21
-/* Ruby 2.0 defines a number of static functions which use rb_fix2int and
0a2201439908 17409417 change vim to use ruby 1.9.3 instead of ruby 1.8.7
April Chin <april.chin@oracle.com>
parents:
diff changeset
    22
+/* Ruby 1.9 defines a number of static functions which use rb_fix2int and
0a2201439908 17409417 change vim to use ruby 1.9.3 instead of ruby 1.8.7
April Chin <april.chin@oracle.com>
parents:
diff changeset
    23
  * rb_num2int if SIZEOF_INT < SIZEOF_LONG (64bit) */
0a2201439908 17409417 change vim to use ruby 1.9.3 instead of ruby 1.8.7
April Chin <april.chin@oracle.com>
parents:
diff changeset
    24
 # define rb_fix2int rb_fix2int_stub
0a2201439908 17409417 change vim to use ruby 1.9.3 instead of ruby 1.8.7
April Chin <april.chin@oracle.com>
parents:
diff changeset
    25
 # define rb_num2int rb_num2int_stub
4878
a720ef1bf2de 21234611 vim should not use ruby 1.9
April Chin <april.chin@oracle.com>
parents: 1871
diff changeset
    26
 #endif
a720ef1bf2de 21234611 vim should not use ruby 1.9
April Chin <april.chin@oracle.com>
parents: 1871
diff changeset
    27
 
a720ef1bf2de 21234611 vim should not use ruby 1.9
April Chin <april.chin@oracle.com>
parents: 1871
diff changeset
    28
+#if defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER == 21
a720ef1bf2de 21234611 vim should not use ruby 1.9
April Chin <april.chin@oracle.com>
parents: 1871
diff changeset
    29
+/* Ruby 2.1 adds new GC called RGenGC and RARRAY_PTR uses
a720ef1bf2de 21234611 vim should not use ruby 1.9
April Chin <april.chin@oracle.com>
parents: 1871
diff changeset
    30
+ * rb_gc_writebarrier_unprotect_promoted if USE_RGENGC  */
a720ef1bf2de 21234611 vim should not use ruby 1.9
April Chin <april.chin@oracle.com>
parents: 1871
diff changeset
    31
+# define rb_gc_writebarrier_unprotect_promoted rb_gc_writebarrier_unprotect_promoted_stub
a720ef1bf2de 21234611 vim should not use ruby 1.9
April Chin <april.chin@oracle.com>
parents: 1871
diff changeset
    32
+#endif
a720ef1bf2de 21234611 vim should not use ruby 1.9
April Chin <april.chin@oracle.com>
parents: 1871
diff changeset
    33
+#if defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER >= 22
a720ef1bf2de 21234611 vim should not use ruby 1.9
April Chin <april.chin@oracle.com>
parents: 1871
diff changeset
    34
+# define rb_gc_writebarrier_unprotect rb_gc_writebarrier_unprotect_stub
a720ef1bf2de 21234611 vim should not use ruby 1.9
April Chin <april.chin@oracle.com>
parents: 1871
diff changeset
    35
+# define rb_check_type rb_check_type_stub
a720ef1bf2de 21234611 vim should not use ruby 1.9
April Chin <april.chin@oracle.com>
parents: 1871
diff changeset
    36
+#endif
a720ef1bf2de 21234611 vim should not use ruby 1.9
April Chin <april.chin@oracle.com>
parents: 1871
diff changeset
    37
+
a720ef1bf2de 21234611 vim should not use ruby 1.9
April Chin <april.chin@oracle.com>
parents: 1871
diff changeset
    38
 #include <ruby.h>
a720ef1bf2de 21234611 vim should not use ruby 1.9
April Chin <april.chin@oracle.com>
parents: 1871
diff changeset
    39
 #ifdef RUBY19_OR_LATER
a720ef1bf2de 21234611 vim should not use ruby 1.9
April Chin <april.chin@oracle.com>
parents: 1871
diff changeset
    40
 # include <ruby/encoding.h>
a720ef1bf2de 21234611 vim should not use ruby 1.9
April Chin <april.chin@oracle.com>
parents: 1871
diff changeset
    41
@@ -197,8 +207,10 @@ static void ruby_vim_init(void);
1871
0a2201439908 17409417 change vim to use ruby 1.9.3 instead of ruby 1.8.7
April Chin <april.chin@oracle.com>
parents:
diff changeset
    42
 # define rb_inspect			dll_rb_inspect
0a2201439908 17409417 change vim to use ruby 1.9.3 instead of ruby 1.8.7
April Chin <april.chin@oracle.com>
parents:
diff changeset
    43
 # define rb_int2inum			dll_rb_int2inum
0a2201439908 17409417 change vim to use ruby 1.9.3 instead of ruby 1.8.7
April Chin <april.chin@oracle.com>
parents:
diff changeset
    44
 # if SIZEOF_INT < SIZEOF_LONG /* 64 bits only */
0a2201439908 17409417 change vim to use ruby 1.9.3 instead of ruby 1.8.7
April Chin <april.chin@oracle.com>
parents:
diff changeset
    45
+# if defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER <= 18
0a2201439908 17409417 change vim to use ruby 1.9.3 instead of ruby 1.8.7
April Chin <april.chin@oracle.com>
parents:
diff changeset
    46
 #  define rb_fix2int			dll_rb_fix2int
0a2201439908 17409417 change vim to use ruby 1.9.3 instead of ruby 1.8.7
April Chin <april.chin@oracle.com>
parents:
diff changeset
    47
 #  define rb_num2int			dll_rb_num2int
0a2201439908 17409417 change vim to use ruby 1.9.3 instead of ruby 1.8.7
April Chin <april.chin@oracle.com>
parents:
diff changeset
    48
+# endif
0a2201439908 17409417 change vim to use ruby 1.9.3 instead of ruby 1.8.7
April Chin <april.chin@oracle.com>
parents:
diff changeset
    49
 #  define rb_num2uint			dll_rb_num2uint
0a2201439908 17409417 change vim to use ruby 1.9.3 instead of ruby 1.8.7
April Chin <april.chin@oracle.com>
parents:
diff changeset
    50
 # endif
0a2201439908 17409417 change vim to use ruby 1.9.3 instead of ruby 1.8.7
April Chin <april.chin@oracle.com>
parents:
diff changeset
    51
 # define rb_lastline_get			dll_rb_lastline_get
4878
a720ef1bf2de 21234611 vim should not use ruby 1.9
April Chin <april.chin@oracle.com>
parents: 1871
diff changeset
    52
@@ -373,8 +385,20 @@ static VALUE (*dll_rb_require) (const ch
a720ef1bf2de 21234611 vim should not use ruby 1.9
April Chin <april.chin@oracle.com>
parents: 1871
diff changeset
    53
 static void* (*ruby_process_options)(int, char**);
a720ef1bf2de 21234611 vim should not use ruby 1.9
April Chin <april.chin@oracle.com>
parents: 1871
diff changeset
    54
 # endif
a720ef1bf2de 21234611 vim should not use ruby 1.9
April Chin <april.chin@oracle.com>
parents: 1871
diff changeset
    55
 
a720ef1bf2de 21234611 vim should not use ruby 1.9
April Chin <april.chin@oracle.com>
parents: 1871
diff changeset
    56
+# if defined(USE_RGENGC) && USE_RGENGC
a720ef1bf2de 21234611 vim should not use ruby 1.9
April Chin <april.chin@oracle.com>
parents: 1871
diff changeset
    57
+#  if defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER == 21
a720ef1bf2de 21234611 vim should not use ruby 1.9
April Chin <april.chin@oracle.com>
parents: 1871
diff changeset
    58
+static void (*dll_rb_gc_writebarrier_unprotect_promoted)(VALUE);
a720ef1bf2de 21234611 vim should not use ruby 1.9
April Chin <april.chin@oracle.com>
parents: 1871
diff changeset
    59
+#  else
a720ef1bf2de 21234611 vim should not use ruby 1.9
April Chin <april.chin@oracle.com>
parents: 1871
diff changeset
    60
+static void (*dll_rb_gc_writebarrier_unprotect)(VALUE obj);
a720ef1bf2de 21234611 vim should not use ruby 1.9
April Chin <april.chin@oracle.com>
parents: 1871
diff changeset
    61
+#  endif
a720ef1bf2de 21234611 vim should not use ruby 1.9
April Chin <april.chin@oracle.com>
parents: 1871
diff changeset
    62
+# endif
a720ef1bf2de 21234611 vim should not use ruby 1.9
April Chin <april.chin@oracle.com>
parents: 1871
diff changeset
    63
+
a720ef1bf2de 21234611 vim should not use ruby 1.9
April Chin <april.chin@oracle.com>
parents: 1871
diff changeset
    64
 # if defined(RUBY19_OR_LATER) && !defined(PROTO)
a720ef1bf2de 21234611 vim should not use ruby 1.9
April Chin <april.chin@oracle.com>
parents: 1871
diff changeset
    65
+#  if defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER >= 22
a720ef1bf2de 21234611 vim should not use ruby 1.9
April Chin <april.chin@oracle.com>
parents: 1871
diff changeset
    66
+long rb_num2long_stub(VALUE x)
a720ef1bf2de 21234611 vim should not use ruby 1.9
April Chin <april.chin@oracle.com>
parents: 1871
diff changeset
    67
+#  else
a720ef1bf2de 21234611 vim should not use ruby 1.9
April Chin <april.chin@oracle.com>
parents: 1871
diff changeset
    68
 SIGNED_VALUE rb_num2long_stub(VALUE x)
a720ef1bf2de 21234611 vim should not use ruby 1.9
April Chin <april.chin@oracle.com>
parents: 1871
diff changeset
    69
+#  endif
a720ef1bf2de 21234611 vim should not use ruby 1.9
April Chin <april.chin@oracle.com>
parents: 1871
diff changeset
    70
 {
a720ef1bf2de 21234611 vim should not use ruby 1.9
April Chin <april.chin@oracle.com>
parents: 1871
diff changeset
    71
     return dll_rb_num2long(x);
a720ef1bf2de 21234611 vim should not use ruby 1.9
April Chin <april.chin@oracle.com>
parents: 1871
diff changeset
    72
 }
a720ef1bf2de 21234611 vim should not use ruby 1.9
April Chin <april.chin@oracle.com>
parents: 1871
diff changeset
    73
@@ -382,7 +406,7 @@ VALUE rb_int2big_stub(SIGNED_VALUE x)
1871
0a2201439908 17409417 change vim to use ruby 1.9.3 instead of ruby 1.8.7
April Chin <april.chin@oracle.com>
parents:
diff changeset
    74
 {
0a2201439908 17409417 change vim to use ruby 1.9.3 instead of ruby 1.8.7
April Chin <april.chin@oracle.com>
parents:
diff changeset
    75
     return dll_rb_int2big(x);
0a2201439908 17409417 change vim to use ruby 1.9.3 instead of ruby 1.8.7
April Chin <april.chin@oracle.com>
parents:
diff changeset
    76
 }
0a2201439908 17409417 change vim to use ruby 1.9.3 instead of ruby 1.8.7
April Chin <april.chin@oracle.com>
parents:
diff changeset
    77
-#  if defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER >= 20 \
0a2201439908 17409417 change vim to use ruby 1.9.3 instead of ruby 1.8.7
April Chin <april.chin@oracle.com>
parents:
diff changeset
    78
+#  if defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER >= 19 \
0a2201439908 17409417 change vim to use ruby 1.9.3 instead of ruby 1.8.7
April Chin <april.chin@oracle.com>
parents:
diff changeset
    79
 	&& SIZEOF_INT < SIZEOF_LONG
0a2201439908 17409417 change vim to use ruby 1.9.3 instead of ruby 1.8.7
April Chin <april.chin@oracle.com>
parents:
diff changeset
    80
 long rb_fix2int_stub(VALUE x)
0a2201439908 17409417 change vim to use ruby 1.9.3 instead of ruby 1.8.7
April Chin <april.chin@oracle.com>
parents:
diff changeset
    81
 {
4878
a720ef1bf2de 21234611 vim should not use ruby 1.9
April Chin <april.chin@oracle.com>
parents: 1871
diff changeset
    82
@@ -399,13 +423,39 @@ rb_float_new_in_heap(double d)
a720ef1bf2de 21234611 vim should not use ruby 1.9
April Chin <april.chin@oracle.com>
parents: 1871
diff changeset
    83
 {
a720ef1bf2de 21234611 vim should not use ruby 1.9
April Chin <april.chin@oracle.com>
parents: 1871
diff changeset
    84
     return dll_rb_float_new(d);
a720ef1bf2de 21234611 vim should not use ruby 1.9
April Chin <april.chin@oracle.com>
parents: 1871
diff changeset
    85
 }
a720ef1bf2de 21234611 vim should not use ruby 1.9
April Chin <april.chin@oracle.com>
parents: 1871
diff changeset
    86
+#   if defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER >= 22
a720ef1bf2de 21234611 vim should not use ruby 1.9
April Chin <april.chin@oracle.com>
parents: 1871
diff changeset
    87
+unsigned long rb_num2ulong(VALUE x)
a720ef1bf2de 21234611 vim should not use ruby 1.9
April Chin <april.chin@oracle.com>
parents: 1871
diff changeset
    88
+#   else
a720ef1bf2de 21234611 vim should not use ruby 1.9
April Chin <april.chin@oracle.com>
parents: 1871
diff changeset
    89
 VALUE rb_num2ulong(VALUE x)
a720ef1bf2de 21234611 vim should not use ruby 1.9
April Chin <april.chin@oracle.com>
parents: 1871
diff changeset
    90
+#   endif
a720ef1bf2de 21234611 vim should not use ruby 1.9
April Chin <april.chin@oracle.com>
parents: 1871
diff changeset
    91
 {
a720ef1bf2de 21234611 vim should not use ruby 1.9
April Chin <april.chin@oracle.com>
parents: 1871
diff changeset
    92
     return (long)RSHIFT((SIGNED_VALUE)(x),1);
a720ef1bf2de 21234611 vim should not use ruby 1.9
April Chin <april.chin@oracle.com>
parents: 1871
diff changeset
    93
 }
a720ef1bf2de 21234611 vim should not use ruby 1.9
April Chin <april.chin@oracle.com>
parents: 1871
diff changeset
    94
 #  endif
a720ef1bf2de 21234611 vim should not use ruby 1.9
April Chin <april.chin@oracle.com>
parents: 1871
diff changeset
    95
 # endif
a720ef1bf2de 21234611 vim should not use ruby 1.9
April Chin <april.chin@oracle.com>
parents: 1871
diff changeset
    96
 
a720ef1bf2de 21234611 vim should not use ruby 1.9
April Chin <april.chin@oracle.com>
parents: 1871
diff changeset
    97
+   /* Do not generate a prototype here, VALUE isn't always defined. */
a720ef1bf2de 21234611 vim should not use ruby 1.9
April Chin <april.chin@oracle.com>
parents: 1871
diff changeset
    98
+# if defined(USE_RGENGC) && USE_RGENGC && !defined(PROTO)
a720ef1bf2de 21234611 vim should not use ruby 1.9
April Chin <april.chin@oracle.com>
parents: 1871
diff changeset
    99
+#  if defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER == 21
a720ef1bf2de 21234611 vim should not use ruby 1.9
April Chin <april.chin@oracle.com>
parents: 1871
diff changeset
   100
+void rb_gc_writebarrier_unprotect_promoted_stub(VALUE obj)
a720ef1bf2de 21234611 vim should not use ruby 1.9
April Chin <april.chin@oracle.com>
parents: 1871
diff changeset
   101
+{
a720ef1bf2de 21234611 vim should not use ruby 1.9
April Chin <april.chin@oracle.com>
parents: 1871
diff changeset
   102
+    dll_rb_gc_writebarrier_unprotect_promoted(obj);
a720ef1bf2de 21234611 vim should not use ruby 1.9
April Chin <april.chin@oracle.com>
parents: 1871
diff changeset
   103
+}
a720ef1bf2de 21234611 vim should not use ruby 1.9
April Chin <april.chin@oracle.com>
parents: 1871
diff changeset
   104
+#  else
a720ef1bf2de 21234611 vim should not use ruby 1.9
April Chin <april.chin@oracle.com>
parents: 1871
diff changeset
   105
+void rb_gc_writebarrier_unprotect_stub(VALUE obj)
a720ef1bf2de 21234611 vim should not use ruby 1.9
April Chin <april.chin@oracle.com>
parents: 1871
diff changeset
   106
+{
a720ef1bf2de 21234611 vim should not use ruby 1.9
April Chin <april.chin@oracle.com>
parents: 1871
diff changeset
   107
+    dll_rb_gc_writebarrier_unprotect(obj);
a720ef1bf2de 21234611 vim should not use ruby 1.9
April Chin <april.chin@oracle.com>
parents: 1871
diff changeset
   108
+}
a720ef1bf2de 21234611 vim should not use ruby 1.9
April Chin <april.chin@oracle.com>
parents: 1871
diff changeset
   109
+#  endif
a720ef1bf2de 21234611 vim should not use ruby 1.9
April Chin <april.chin@oracle.com>
parents: 1871
diff changeset
   110
+# endif
a720ef1bf2de 21234611 vim should not use ruby 1.9
April Chin <april.chin@oracle.com>
parents: 1871
diff changeset
   111
+
a720ef1bf2de 21234611 vim should not use ruby 1.9
April Chin <april.chin@oracle.com>
parents: 1871
diff changeset
   112
+# if defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER >= 22
a720ef1bf2de 21234611 vim should not use ruby 1.9
April Chin <april.chin@oracle.com>
parents: 1871
diff changeset
   113
+void rb_check_type_stub(VALUE v, int i)
a720ef1bf2de 21234611 vim should not use ruby 1.9
April Chin <april.chin@oracle.com>
parents: 1871
diff changeset
   114
+{
a720ef1bf2de 21234611 vim should not use ruby 1.9
April Chin <april.chin@oracle.com>
parents: 1871
diff changeset
   115
+    dll_rb_check_type(v, i);
a720ef1bf2de 21234611 vim should not use ruby 1.9
April Chin <april.chin@oracle.com>
parents: 1871
diff changeset
   116
+}
a720ef1bf2de 21234611 vim should not use ruby 1.9
April Chin <april.chin@oracle.com>
parents: 1871
diff changeset
   117
+# endif
a720ef1bf2de 21234611 vim should not use ruby 1.9
April Chin <april.chin@oracle.com>
parents: 1871
diff changeset
   118
+
a720ef1bf2de 21234611 vim should not use ruby 1.9
April Chin <april.chin@oracle.com>
parents: 1871
diff changeset
   119
 static HINSTANCE hinstRuby = NULL; /* Instance of ruby.dll */
a720ef1bf2de 21234611 vim should not use ruby 1.9
April Chin <april.chin@oracle.com>
parents: 1871
diff changeset
   120
 
a720ef1bf2de 21234611 vim should not use ruby 1.9
April Chin <april.chin@oracle.com>
parents: 1871
diff changeset
   121
 /*
a720ef1bf2de 21234611 vim should not use ruby 1.9
April Chin <april.chin@oracle.com>
parents: 1871
diff changeset
   122
@@ -521,6 +571,13 @@ static struct
a720ef1bf2de 21234611 vim should not use ruby 1.9
April Chin <april.chin@oracle.com>
parents: 1871
diff changeset
   123
 #  endif
a720ef1bf2de 21234611 vim should not use ruby 1.9
April Chin <april.chin@oracle.com>
parents: 1871
diff changeset
   124
     {"ruby_init_stack", (RUBY_PROC*)&dll_ruby_init_stack},
a720ef1bf2de 21234611 vim should not use ruby 1.9
April Chin <april.chin@oracle.com>
parents: 1871
diff changeset
   125
 # endif
a720ef1bf2de 21234611 vim should not use ruby 1.9
April Chin <april.chin@oracle.com>
parents: 1871
diff changeset
   126
+# if defined(USE_RGENGC) && USE_RGENGC
a720ef1bf2de 21234611 vim should not use ruby 1.9
April Chin <april.chin@oracle.com>
parents: 1871
diff changeset
   127
+#  if defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER == 21
a720ef1bf2de 21234611 vim should not use ruby 1.9
April Chin <april.chin@oracle.com>
parents: 1871
diff changeset
   128
+    {"rb_gc_writebarrier_unprotect_promoted", (RUBY_PROC*)&dll_rb_gc_writebarrier_unprotect_promoted},
a720ef1bf2de 21234611 vim should not use ruby 1.9
April Chin <april.chin@oracle.com>
parents: 1871
diff changeset
   129
+#  else
a720ef1bf2de 21234611 vim should not use ruby 1.9
April Chin <april.chin@oracle.com>
parents: 1871
diff changeset
   130
+    {"rb_gc_writebarrier_unprotect", (RUBY_PROC*)&dll_rb_gc_writebarrier_unprotect},
a720ef1bf2de 21234611 vim should not use ruby 1.9
April Chin <april.chin@oracle.com>
parents: 1871
diff changeset
   131
+#  endif
a720ef1bf2de 21234611 vim should not use ruby 1.9
April Chin <april.chin@oracle.com>
parents: 1871
diff changeset
   132
+# endif
a720ef1bf2de 21234611 vim should not use ruby 1.9
April Chin <april.chin@oracle.com>
parents: 1871
diff changeset
   133
     {"", NULL},
a720ef1bf2de 21234611 vim should not use ruby 1.9
April Chin <april.chin@oracle.com>
parents: 1871
diff changeset
   134
 };
a720ef1bf2de 21234611 vim should not use ruby 1.9
April Chin <april.chin@oracle.com>
parents: 1871
diff changeset
   135