1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

* hash.c (getenv): fixed test failures introduced by r43950.

[ruby-core:58774] [Bug #9195] reported by phasis68 (Heesob Park).


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43958 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
usa 2013-12-02 13:31:14 +00:00
parent ead0c5d356
commit ff9f9c6d84
2 changed files with 7 additions and 1 deletions

View file

@ -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

3
hash.c
View file

@ -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())