compiles on ruby 1.8.7 / but test fail

nyaxt · justincase · commit 1a0a1246aabd · 2015-05-27T23:42:00.000+02:00
diff --git a/ext/mysql2/statement.c b/ext/mysql2/statement.c
@@ -56,7 +56,9 @@ static void rb_raise_mysql2_stmt_error(VALUE self) {
   GET_STATEMENT(self);
   {
     GET_CLIENT(stmt_wrapper->client);
+#ifdef HAVE_RUBY_ENCODING_H
     conn_enc = rb_to_encoding(wrapper->encoding);
+#endif
   }
 
   rb_raise_mysql2_stmt_error2(stmt_wrapper->stmt
diff --git a/spec/mysql2/statement_spec.rb b/spec/mysql2/statement_spec.rb
@@ -125,7 +125,7 @@
       result.to_a.should == [{"整数"=>1}]
     end
 
-  end
+  end if defined? Encoding
 
   context "streaming result" do
     it "should be able to stream query result" do

Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,9 @@ static void rb_raise_mysql2_stmt_error(VALUE self) {`
`56`	`56`	`GET_STATEMENT(self);`
`57`	`57`	`{`
`58`	`58`	`GET_CLIENT(stmt_wrapper->client);`
	`59`	`+#ifdef HAVE_RUBY_ENCODING_H`
`59`	`60`	`conn_enc = rb_to_encoding(wrapper->encoding);`
	`61`	`+#endif`
`60`	`62`	`}`
`61`	`63`
`62`	`64`	`rb_raise_mysql2_stmt_error2(stmt_wrapper->stmt`