diff options
author | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-10-29 05:30:50 +0000 |
---|---|---|
committer | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-10-29 05:30:50 +0000 |
commit | 56eee285be2e18f727ef15d58e338b134c3ab210 (patch) | |
tree | aed87dd85181c76b099fc5c620ac1606f65f09c8 /dir.c | |
parent | 106f033b89fed268fe376ebaf16cb95fda655e6a (diff) | |
download | ruby-56eee285be2e18f727ef15d58e338b134c3ab210.tar.gz |
revert r52336 (commit miss)
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@52337 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'dir.c')
-rw-r--r-- | dir.c | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -674,7 +674,7 @@ dir_path(VALUE dir) static int fundamental_encoding_p(rb_encoding *enc) { - switch (enc_to_index(enc)) { + switch (rb_enc_to_index(enc)) { case ENCINDEX_ASCII: case ENCINDEX_US_ASCII: case ENCINDEX_UTF_8: @@ -1010,7 +1010,7 @@ rb_dir_getwd(void) { char *path; VALUE cwd; - int fsenc = enc_to_index(rb_filesystem_encoding()); + int fsenc = rb_enc_to_index(rb_filesystem_encoding()); if (fsenc == ENCINDEX_US_ASCII) fsenc = ENCINDEX_ASCII; path = my_getcwd(); @@ -2139,9 +2139,9 @@ push_glob(VALUE ary, VALUE str, int flags) #ifdef __APPLE__ str = rb_str_encode_ospath(str); #endif - if (enc_to_index(enc) == ENCINDEX_US_ASCII) + if (rb_enc_to_index(enc) == ENCINDEX_US_ASCII) enc = rb_filesystem_encoding(); - if (enc_to_index(enc) == ENCINDEX_US_ASCII) + if (rb_enc_to_index(enc) == ENCINDEX_US_ASCII) enc = rb_ascii8bit_encoding(); flags |= GLOB_VERBOSE; args.glob.func = push_pattern; |