From: mquinson <mquinson@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Date: Tue, 20 May 2008 23:20:37 +0000 (+0000)
Subject: Extra care for environ shouldn't be mandatory here, since that's not a dynamic librar... 
X-Git-Tag: v3.3~470
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/d82e015777b68aabdb4e584062eddc5cee7ee9c9

Extra care for environ shouldn't be mandatory here, since that's not a dynamic library but a binary. But the linker complains anyway

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@5466 48e7efb5-ca39-0410-a469-dd3cf9ba447f
---

diff --git a/tools/tesh/run_context.c b/tools/tesh/run_context.c
index 7a9187337e..7f61ae125d 100644
--- a/tools/tesh/run_context.c
+++ b/tools/tesh/run_context.c
@@ -102,6 +102,15 @@ void rctx_armageddon(rctx_t initiator, int exitcode) {
  * Memory management
  */
 
+# ifdef __APPLE__
+/* under darwin, the environment gets added to the process at startup time. So, it's not defined at library link time, forcing us to extra tricks */
+# include <crt_externs.h>
+# define environ (*_NSGetEnviron())
+# else
+ /* the environment, as specified by the opengroup, used to initialize the process properties */
+ extern char **environ;
+# endif
+
 void rctx_empty(rctx_t rc) {
   int i;
   char **env_it=environ;
@@ -133,8 +142,6 @@ void rctx_empty(rctx_t rc) {
   xbt_strbuff_empty(rc->output_got);
 }
 
-/* the environment, as specified by the opengroup */
-extern char **environ;
 
 rctx_t rctx_new() {
   rctx_t res = xbt_new0(s_rctx_t,1);