From 56eee285be2e18f727ef15d58e338b134c3ab210 Mon Sep 17 00:00:00 2001 From: ko1 Date: Thu, 29 Oct 2015 05:30:50 +0000 Subject: revert r52336 (commit miss) git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@52337 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- encindex.h | 22 ---------------------- 1 file changed, 22 deletions(-) (limited to 'encindex.h') diff --git a/encindex.h b/encindex.h index 0527259c27..dcb1646f3a 100644 --- a/encindex.h +++ b/encindex.h @@ -57,28 +57,6 @@ enum ruby_preserved_encindex { #define rb_utf8_encindex() RUBY_ENCINDEX_UTF_8 #define rb_usascii_encindex() RUBY_ENCINDEX_US_ASCII -#ifdef RUBY_ENCODING_H -#define ENC_INDEX_MASK (~(~0U<<24)) -#define ENC_TO_ENCINDEX(enc) (int)((enc)->ruby_encoding_index & ENC_INDEX_MASK) - -static inline int -enc_to_index(rb_encoding *enc) -{ - return enc ? ENC_TO_ENCINDEX(enc) : 0; -} - -static inline int -str_enc_get_index(VALUE str) -{ - int i = ENCODING_GET_INLINED(str); - if (i == ENCODING_INLINE_MAX) { - VALUE iv = rb_ivar_get(str, rb_id_encoding()); - i = NUM2INT(iv); - } - return i; -} -#endif - #if defined(__cplusplus) #if 0 { /* satisfy cc-mode */ -- cgit v1.2.3