diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | hash.c | 3 |
2 files changed, 7 insertions, 1 deletions
@@ -1,3 +1,8 @@ +Mon Dec 2 22:30:10 2013 NAKAMURA Usaku <usa@ruby-lang.org> + + * hash.c (getenv): fixed test failures introduced by r43950. + [ruby-core:58774] [Bug #9195] reported by phasis68 (Heesob Park). + Mon Dec 2 21:49:19 2013 Masaki Matsushita <glass.saga@gmail.com> * hash.c (rb_hash_rehash): make temporary st_table under the control @@ -2409,7 +2409,7 @@ static char **my_environ; #define environ my_environ #undef getenv inline char * -getenv(const char *name) +w32_getenv(const char *name) { static int binary = -1; static int locale = -1; @@ -2419,6 +2419,7 @@ getenv(const char *name) } return locale == binary ? rb_w32_getenv(name) : rb_w32_ugetenv(name); } +#define getenv(n) w32_getenv(n) #elif defined(__APPLE__) #undef environ #define environ (*_NSGetEnviron()) |