diff options
| author | ser <ser@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-09-22 12:40:45 +0000 |
|---|---|---|
| committer | ser <ser@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-09-22 12:40:45 +0000 |
| commit | 8b53e39a2e6110cf13827c88673a3ef2667991cf (patch) | |
| tree | eb1fa37c2a675b75c295285b5c313ba05801c2b8 /include/ruby/ruby.h | |
| parent | f36a3f0ea57aa05a72cb58937c7a737455a98a38 (diff) | |
| download | ruby-rexml_adds_tests.tar.gz | |
Second merge from trunk.rexml_adds_tests
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/rexml_adds_tests@19455 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'include/ruby/ruby.h')
| -rw-r--r-- | include/ruby/ruby.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/ruby/ruby.h b/include/ruby/ruby.h index d8ae11b204..eb80bce4c2 100644 --- a/include/ruby/ruby.h +++ b/include/ruby/ruby.h @@ -650,7 +650,7 @@ struct RRational { struct RComplex { struct RBasic basic; VALUE real; - VALUE image; + VALUE imag; }; struct RData { @@ -851,7 +851,7 @@ void rb_define_alias(VALUE,const char*,const char*); void rb_define_attr(VALUE,const char*,int,int); void rb_global_variable(VALUE*); -void rb_register_mark_object(VALUE); +void rb_gc_register_mark_object(VALUE); void rb_gc_register_address(VALUE*); void rb_gc_unregister_address(VALUE*); @@ -982,6 +982,7 @@ RUBY_EXTERN VALUE rb_cCont; RUBY_EXTERN VALUE rb_cDir; RUBY_EXTERN VALUE rb_cData; RUBY_EXTERN VALUE rb_cFalseClass; +RUBY_EXTERN VALUE rb_cEncoding; RUBY_EXTERN VALUE rb_cEnumerator; RUBY_EXTERN VALUE rb_cFile; RUBY_EXTERN VALUE rb_cFixnum; |