Skip to content

Make memcache work with ruby 2.1 #25

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
oleg-z wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Make memcache work with ruby 2.1 #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3b0dccf
Make it work with ruby 2.1
olegz-alertlogic Sep 16, 2014
9df8012
add support for Ruby 2.2.x
Nov 30, 2015
1ca1b16
Merge pull request #1 from james-poore/master
oleg-z Nov 30, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions ext/extconf.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,8 @@ def copy_gem(gem_dir)
# thanks to: https://gist.github.com/IanVaughan/5489431
$CPPFLAGS += " -DRUBY_19" if RUBY_VERSION =~ /1.9/
$CPPFLAGS += " -DRUBY_20" if RUBY_VERSION =~ /2.0/
$CPPFLAGS += " -DRUBY_21" if RUBY_VERSION =~ /2.1/
$CPPFLAGS += " -DRUBY_22" if RUBY_VERSION =~ /2.2/

puts "*** Using Ruby version: #{RUBY_VERSION}"
puts "*** with CPPFLAGS: #{$CPPFLAGS}"
Expand Down
2 changes: 1 addition & 1 deletion ext/native_server.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ static VALUE mc_initialize(VALUE self, VALUE opts) {
return self;
}

#if defined(RUBY_19) || defined(RUBY_20)
#if defined(RUBY_19) || defined(RUBY_20) || defined(RUBY_21) || defined(RUBY_22)
#define RSTRING_SET_LEN(str, newlen) (rb_str_set_len(str, new_len))
#else
#define RSTRING_SET_LEN(str, newlen) (RSTRING(str)->len = new_len)
Expand Down