don't attempt to inline mysql2_set_field_string_encoding

brianmario · brianmario · commit d3a96b8e11e9 · 2011-10-31T12:41:32.000-07:00
diff --git a/ext/mysql2/result.c b/ext/mysql2/result.c
@@ -139,7 +139,7 @@ static VALUE rb_mysql_result_fetch_field(VALUE self, unsigned int idx, short int
 }
 
 #ifdef HAVE_RUBY_ENCODING_H
-inline VALUE mysql2_set_field_string_encoding(VALUE val, MYSQL_FIELD field, rb_encoding *default_internal_enc, rb_encoding *conn_enc) {
+static VALUE mysql2_set_field_string_encoding(VALUE val, MYSQL_FIELD field, rb_encoding *default_internal_enc, rb_encoding *conn_enc) {
   // if binary flag is set, respect it's wishes
   if (field.flags & BINARY_FLAG && field.charsetnr == 63) {
     rb_enc_associate(val, binaryEncoding);

Original file line number	Diff line number	Diff line change
`@@ -139,7 +139,7 @@ static VALUE rb_mysql_result_fetch_field(VALUE self, unsigned int idx, short int`
`139`	`139`	`}`
`140`	`140`
`141`	`141`	`#ifdef HAVE_RUBY_ENCODING_H`
`142`		`-inline VALUE mysql2_set_field_string_encoding(VALUE val, MYSQL_FIELD field, rb_encoding default_internal_enc, rb_encoding conn_enc) {`
	`142`	`+static VALUE mysql2_set_field_string_encoding(VALUE val, MYSQL_FIELD field, rb_encoding default_internal_enc, rb_encoding conn_enc) {`
`143`	`143`	`// if binary flag is set, respect it's wishes`
`144`	`144`	`if (field.flags & BINARY_FLAG && field.charsetnr == 63) {`
`145`	`145`	`rb_enc_associate(val, binaryEncoding);`