summaryrefslogtreecommitdiffstats
path: root/generic/tclEnv.c
diff options
context:
space:
mode:
authordas <das>2007-08-07 05:04:48 (GMT)
committerdas <das>2007-08-07 05:04:48 (GMT)
commit34d95ab0f6f686309ce09ec37889afc625f25149 (patch)
tree3bbf2749497a8d2a6bce94be18b879e1fec2b0ca /generic/tclEnv.c
parent5bd8a0386d769f512da9dab55cd949fd0d8329bc (diff)
downloadtcl-34d95ab0f6f686309ce09ec37889afc625f25149.zip
tcl-34d95ab0f6f686309ce09ec37889afc625f25149.tar.gz
tcl-34d95ab0f6f686309ce09ec37889afc625f25149.tar.bz2
* generic/tclEnv.c: improve environ handling on Mac OS X (adapted
* unix/tclUnixPort.h: from Apple changes in Darwin tcl-64).
Diffstat (limited to 'generic/tclEnv.c')
-rw-r--r--generic/tclEnv.c24
1 files changed, 1 insertions, 23 deletions
diff --git a/generic/tclEnv.c b/generic/tclEnv.c
index a7c7c39..198ff81 100644
--- a/generic/tclEnv.c
+++ b/generic/tclEnv.c
@@ -12,7 +12,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclEnv.c,v 1.20.2.3 2006/10/31 22:25:08 das Exp $
+ * RCS: @(#) $Id: tclEnv.c,v 1.20.2.4 2007/08/07 05:04:48 das Exp $
*/
#include "tclInt.h"
@@ -39,15 +39,6 @@ static int environSize = 0; /* Non-zero means that the environ array was
#endif
/*
- * For MacOS X
- */
-#if defined(__APPLE__) && defined(__DYNAMIC__)
-#include <crt_externs.h>
-__private_extern__ char **environ;
-char **environ = NULL;
-#endif
-
-/*
* Declarations for local procedures defined in this file:
*/
@@ -97,13 +88,6 @@ TclSetupEnv(interp)
int i;
/*
- * For MacOS X
- */
-#if defined(__APPLE__) && defined(__DYNAMIC__)
- environ = *_NSGetEnviron();
-#endif
-
- /*
* Synchronize the values in the environ array with the contents
* of the Tcl "env" variable. To do this:
* 1) Remove the trace that fires when the "env" var is unset.
@@ -214,12 +198,6 @@ TclSetEnv(name, value)
}
environ = ourEnviron = newEnviron;
environSize = length + 5;
-#if defined(__APPLE__) && defined(__DYNAMIC__)
- {
- char ***e = _NSGetEnviron();
- *e = environ;
- }
-#endif
}
index = length;
environ[index + 1] = NULL;