Revision: 4380 http://trac.macosforge.org/projects/ruby/changeset/4380 Author: lsansonetti@apple.com Date: 2010-07-24 17:55:44 -0700 (Sat, 24 Jul 2010) Log Message: ----------- some MRI compat fixes to make nokogiri build/load Modified Paths: -------------- MacRuby/trunk/include/ruby/defines.h MacRuby/trunk/include/ruby/encoding.h Modified: MacRuby/trunk/include/ruby/defines.h =================================================================== --- MacRuby/trunk/include/ruby/defines.h 2010-07-24 18:58:05 UTC (rev 4379) +++ MacRuby/trunk/include/ruby/defines.h 2010-07-25 00:55:44 UTC (rev 4380) @@ -294,6 +294,11 @@ #define HAVE_RUBY_VM_H #endif +#ifndef HAVE_RUBY_ENCODING_H +// Some C extensions use that variable to determine if they build against 1.9. +#define HAVE_RUBY_ENCODING_H +#endif + #define force_inline __attribute__((always_inline)) #if defined(__cplusplus) Modified: MacRuby/trunk/include/ruby/encoding.h =================================================================== --- MacRuby/trunk/include/ruby/encoding.h 2010-07-24 18:58:05 UTC (rev 4379) +++ MacRuby/trunk/include/ruby/encoding.h 2010-07-25 00:55:44 UTC (rev 4380) @@ -40,7 +40,6 @@ VALUE rb_enc_vsprintf(rb_encoding *, const char*, va_list); long rb_enc_strlen(const char*, const char*, rb_encoding*); char* rb_enc_nth(const char*, const char*, int, rb_encoding*); -VALUE rb_obj_encoding(VALUE, SEL); VALUE rb_enc_str_buf_cat(VALUE str, const char *ptr, long len, rb_encoding *enc); /* index -> rb_encoding */ @@ -137,6 +136,9 @@ VALUE rb_str_transcode(VALUE str, VALUE to); +// MRI compat. +#define rb_external_str_new_with_enc rb_enc_str_new + #if defined(__cplusplus) } #endif