summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-10-05 02:26:45 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-10-05 02:26:45 +0000
commit5e1311da38bf0ce8d0ea99e8dc86a159542b5552 (patch)
tree0c6c8b6fc459bc21cc5583448a51c63f21bcaa5a
parent146ea3c398fb371cfad4c9abea47535e9e08eebc (diff)
* eval.c: come back definition of environ.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19684 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--eval.c2
2 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 2a154b677c..fac1fc94be 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sun Oct 5 11:24:42 2008 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * eval.c: come back definition of environ.
+
Sun Oct 5 09:19:49 2008 NARUSE, Yui <naruse@ruby-lang.org>
* ext/nkf/nkf-utf8/utf8tbl.c: update table.
diff --git a/eval.c b/eval.c
index 854e390c02..51d461659a 100644
--- a/eval.c
+++ b/eval.c
@@ -31,6 +31,8 @@ VALUE rb_eSysStackError;
#if defined(__APPLE__)
#define environ (*_NSGetEnviron())
+#elif !defined(_WIN32) && !defined(__MACOS__) || defined(_WIN32_WCE)
+extern char **environ;
#endif
char **rb_origenviron;