diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-03-05 01:10:41 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-03-05 01:10:41 +0000 |
| commit | ec46ba5b90c3c9d4d73fea7989681d78c7c9ec7b (patch) | |
| tree | 03e5ce3e569a56bb2bb70682cf1f234f11431b93 | |
| parent | 4f39e639f4f73b417f6ba3c74dc2e7ab059bf028 (diff) | |
* include/ruby/encoding.h (enc_initialized_p): ENC_UNINITIALIZED
is not defined already.
* include/ruby/encoding.h (ENC_FROM_ENCINDEX): removed because
depending on a static variable.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@22773 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | include/ruby/encoding.h | 3 |
2 files changed, 8 insertions, 3 deletions
@@ -1,3 +1,11 @@ +Thu Mar 5 10:10:40 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * include/ruby/encoding.h (enc_initialized_p): ENC_UNINITIALIZED + is not defined already. + + * include/ruby/encoding.h (ENC_FROM_ENCINDEX): removed because + depending on a static variable. + Thu Mar 5 04:42:52 2009 Yusuke Endoh <mame@tsg.ne.jp> * test/ruby/test_array.rb: fix wrong test, and add a test for diff --git a/include/ruby/encoding.h b/include/ruby/encoding.h index 6a808a58cb..b28ddc9a7f 100644 --- a/include/ruby/encoding.h +++ b/include/ruby/encoding.h @@ -184,13 +184,10 @@ VALUE rb_locale_charmap(VALUE klass); long rb_memsearch(const void*,long,const void*,long,rb_encoding*); RUBY_EXTERN VALUE rb_cEncoding; -#define enc_initialized_p(enc) ((enc)->ruby_encoding_index != ENC_UNINITIALIZED) #define ENC_DUMMY_FLAG (1<<24) #define ENC_INDEX_MASK (~(~0U<<24)) #define ENC_TO_ENCINDEX(enc) ((enc)->ruby_encoding_index & ENC_INDEX_MASK) -#define ENC_FROM_ENCINDEX(idx) (RARRAY_PTR(rb_encoding_list)[idx]) -#define ENC_FROM_ENCODING(enc) ENC_FROM_ENCINDEX(ENC_TO_ENCINDEX(enc)) #define ENC_DUMMY_P(enc) ((enc)->ruby_encoding_index & ENC_DUMMY_FLAG) #define ENC_SET_DUMMY(enc) ((enc)->ruby_encoding_index |= ENC_DUMMY_FLAG) |