Permalink
Browse files

Merge pull request #109 from coolo/master

Testing with ruby-head
  • Loading branch information...
2 parents b08b3f7 + 692cab8 commit 945a3516291263e353f0d3b47567ead0f9df93aa @brianmario committed Sep 12, 2012
Showing with 6 additions and 5 deletions.
  1. +2 −1 .travis.yml
  2. +4 −4 ext/yajl/yajl_ext.h
View
@@ -3,4 +3,5 @@ rvm:
- 1.9.2
- 1.9.3
- rbx
- - ree
+ - ree
+ - ruby-head
View
@@ -24,9 +24,9 @@
#include "api/yajl_parse.h"
#include "api/yajl_gen.h"
-// tell rbx not to use it's caching compat layer
-// by doing this we're making a promize to RBX that
-// we'll never modify the pointers we get back from RSTRING_PTR
+/* tell rbx not to use it's caching compat layer
+ by doing this we're making a promize to RBX that
+ we'll never modify the pointers we get back from RSTRING_PTR */
#define RSTRING_NOT_MODIFIED
#include <ruby.h>
@@ -132,4 +132,4 @@ static VALUE rb_yajl_json_ext_false_to_json(int argc, VALUE * argv, VALUE self);
static VALUE rb_yajl_json_ext_nil_to_json(int argc, VALUE * argv, VALUE self);
static VALUE rb_yajl_encoder_enable_json_gem_ext(VALUE klass);
-void Init_yajl();
+void Init_yajl();

0 comments on commit 945a351

Please sign in to comment.