ruby-changes:31879
From: usa <ko1@a...>
Date: Mon, 2 Dec 2013 22:31:22 +0900 (JST)
Subject: [ruby-changes:31879] usa:r43958 (trunk): * hash.c (getenv): fixed test failures introduced by r43950.
usa 2013-12-02 22:31:14 +0900 (Mon, 02 Dec 2013) New Revision: 43958 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=43958 Log: * hash.c (getenv): fixed test failures introduced by r43950. [ruby-core:58774] [Bug #9195] reported by phasis68 (Heesob Park). Modified files: trunk/ChangeLog trunk/hash.c Index: ChangeLog =================================================================== --- ChangeLog (revision 43957) +++ ChangeLog (revision 43958) @@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1 +Mon Dec 2 22:30:10 2013 NAKAMURA Usaku <usa@r...> + + * 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@g...> * hash.c (rb_hash_rehash): make temporary st_table under the control Index: hash.c =================================================================== --- hash.c (revision 43957) +++ hash.c (revision 43958) @@ -2409,7 +2409,7 @@ static char **my_environ; https://github.com/ruby/ruby/blob/trunk/hash.c#L2409 #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) https://github.com/ruby/ruby/blob/trunk/hash.c#L2419 } 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()) -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/