From 25f61288511fcd3dca5ef80fbf6b6cead5ec7856 Mon Sep 17 00:00:00 2001 From: nobu Date: Thu, 5 Mar 2009 01:10:41 +0000 Subject: * 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: http://svn.ruby-lang.org/repos/ruby/trunk@22773 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- include/ruby/encoding.h | 3 --- 1 file changed, 3 deletions(-) (limited to 'include/ruby') diff --git a/include/ruby/encoding.h b/include/ruby/encoding.h index 6a808a58c..b28ddc9a7 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) -- cgit