diff options
| author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-08-14 12:11:14 +0000 |
|---|---|---|
| committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-08-14 12:11:14 +0000 |
| commit | d46728ec0e134c47a9cf7b1f63d5a0c88902162e (patch) | |
| tree | 227bb93e09714ead52d5b90e782eb7155583a94e /encoding.c | |
| parent | db30661aa9635d665c8d39592fb18bfb89331410 (diff) | |
* encoding.c (rb_filesystem_encoding): use default external encoding
for Unix.
* dir.c (dir_initialize): don't cache fs_encoding.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@18622 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'encoding.c')
| -rw-r--r-- | encoding.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/encoding.c b/encoding.c index d1cf17510d..ca08416fe6 100644 --- a/encoding.c +++ b/encoding.c @@ -962,16 +962,14 @@ rb_locale_encoding(void) rb_encoding * rb_filesystem_encoding(void) { - static rb_encoding *enc; - if (!enc) { + rb_encoding *enc; #if defined _WIN32 - enc = rb_locale_encoding(); + enc = rb_locale_encoding(); #elif defined __APPLE__ - enc = rb_enc_find("UTF8-MAC"); + enc = rb_enc_find("UTF8-MAC"); #else - enc = rb_locale_encoding(); + enc = rb_default_external_encoding(); #endif - } return enc; } |