Skip to content

Commit

Permalink
updated for version 7.4.168
Browse files Browse the repository at this point in the history
Problem:    Can't compile with Ruby 2.1.0.
Solution:   Add support for new GC. (Kohei Suzuki)
  • Loading branch information
brammool committed Feb 5, 2014
1 parent d09d83e commit 3aae3b7
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 0 deletions.
20 changes: 20 additions & 0 deletions src/if_ruby.c
Expand Up @@ -96,6 +96,12 @@
# define rb_num2int rb_num2int_stub
#endif

# if defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER >= 21
/* Ruby 2.1 adds new GC called RGenGC and RARRAY_PTR uses
* rb_gc_writebarrier_unprotect_promoted if USE_RGENGC */
# define rb_gc_writebarrier_unprotect_promoted rb_gc_writebarrier_unprotect_promoted_stub
# endif

#include <ruby.h>
#ifdef RUBY19_OR_LATER
# include <ruby/encoding.h>
Expand Down Expand Up @@ -373,6 +379,10 @@ static VALUE (*dll_rb_require) (const char*);
static void* (*ruby_process_options)(int, char**);
# endif

# if defined(USE_RGENGC) && USE_RGENGC
static void (*dll_rb_gc_writebarrier_unprotect_promoted)(VALUE);
# endif

# if defined(RUBY19_OR_LATER) && !defined(PROTO)
SIGNED_VALUE rb_num2long_stub(VALUE x)
{
Expand Down Expand Up @@ -406,6 +416,13 @@ VALUE rb_num2ulong(VALUE x)
# endif
# endif

# if defined(USE_RGENGC) && USE_RGENGC
void rb_gc_writebarrier_unprotect_promoted_stub(VALUE obj)
{
return dll_rb_gc_writebarrier_unprotect_promoted(obj);
}
# endif

static HINSTANCE hinstRuby = NULL; /* Instance of ruby.dll */

/*
Expand Down Expand Up @@ -520,6 +537,9 @@ static struct
{"rb_ia64_bsp", (RUBY_PROC*)&dll_rb_ia64_bsp},
# endif
{"ruby_init_stack", (RUBY_PROC*)&dll_ruby_init_stack},
# endif
# if defined(USE_RGENGC) && USE_RGENGC
{"rb_gc_writebarrier_unprotect_promoted", (RUBY_PROC*)&dll_rb_gc_writebarrier_unprotect_promoted},
# endif
{"", NULL},
};
Expand Down
2 changes: 2 additions & 0 deletions src/version.c
Expand Up @@ -738,6 +738,8 @@ static char *(features[]) =

static int included_patches[] =
{ /* Add new patch number below this line */
/**/
168,
/**/
167,
/**/
Expand Down

0 comments on commit 3aae3b7

Please sign in to comment.