diff options
| author | knu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2002-10-17 16:13:44 +0000 |
|---|---|---|
| committer | knu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2002-10-17 16:13:44 +0000 |
| commit | 03f2c65ab25341a03e6b59eb6b84be2e4e9e6c89 (patch) | |
| tree | f62049451f68c0a2ae407349faa4a9f53e61e0df /hash.c | |
| parent | 0a9cab1147f55a000a1995d59e316462791b8412 (diff) | |
| download | ruby-03f2c65ab25341a03e6b59eb6b84be2e4e9e6c89.tar.gz ruby-03f2c65ab25341a03e6b59eb6b84be2e4e9e6c89.tar.xz ruby-03f2c65ab25341a03e6b59eb6b84be2e4e9e6c89.zip | |
* hash.c, eval.c: Use (*_NSGetEnviron()) instead of environ on
Darwin for namespace cleanness. [ruby-core:00537]
* dln.c (dln_load): Fix Darwin support that has been disabled and
switch to using it on Darwin instead of the system dlopen().
[ruby-core:00541]
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@2969 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'hash.c')
| -rw-r--r-- | hash.c | 9 |
1 files changed, 9 insertions, 0 deletions
@@ -17,6 +17,10 @@ #include "util.h" #include "rubysig.h" +#ifdef __APPLE__ +#include <crt_externs.h> +#endif + #define HASH_DELETED FL_USER1 #define HASH_PROC_DEFAULT FL_USER2 @@ -944,6 +948,11 @@ static char **origenviron; static char **my_environ; #undef environ #define environ my_environ +#elif defined(__APPLE__) +#undef environ +#define environ (*_NSGetEnviron()) +#define GET_ENVIRON(e) (e) +#define FREE_ENVIRON(e) #else extern char **environ; #define GET_ENVIRON(e) (e) |