summaryrefslogtreecommitdiffstats
path: root/generic/tclEnv.c
diff options
context:
space:
mode:
authorhobbs <hobbs>2000-04-19 08:32:43 (GMT)
committerhobbs <hobbs>2000-04-19 08:32:43 (GMT)
commit7f65ab0b58bee6c8d6c49e4e831d34970bc6fedd (patch)
treed0760a65b11e677dd7757cb4a48fb036769992db /generic/tclEnv.c
parent6f99bc0b628826792dfe213f55fba95db4bf1e05 (diff)
downloadtcl-7f65ab0b58bee6c8d6c49e4e831d34970bc6fedd.zip
tcl-7f65ab0b58bee6c8d6c49e4e831d34970bc6fedd.tar.gz
tcl-7f65ab0b58bee6c8d6c49e4e831d34970bc6fedd.tar.bz2
* README:
* generic/tcl.h: * tools/tcl.wse.in: * unix/configure.in: * unix/tcl.spec: * win/configure.in: * win/README.binary: bumped version to 8.3.1 * win/tcl.hpj.in: updated copyright date * generic/tclEnv.c: environment support for Mac OS/X * unix/tclUnixPort.h: environment support for Mac OS/X * unix/tclLoadDyld.c: new file for Mac OS/X dl functions * unix/Makefile.in: added install-strip target; bindir, libdir, mandir, includedir vars; tclLoadDyld.c target [Bug: 2527] * unix/tclUnixChan.c (CreateSocket): force a socket back into blocking mode (default state) after a -async connect succeeds. [Bug: 4388] * generic/tclEvent.c (TclInitSubsystems): Moved tclLibraryPath to thread-local storage to prevent thread-related race condition. [Bug: 5033] * unix/tclAppInit.c (main): removed #ifdef TCL_TEST that sets the library path as it was unnecessary and conflicts with move of tclLibraryPath to thread-local storage.
Diffstat (limited to 'generic/tclEnv.c')
-rw-r--r--generic/tclEnv.c17
1 files changed, 16 insertions, 1 deletions
diff --git a/generic/tclEnv.c b/generic/tclEnv.c
index 49984c9..2fa6726 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.6 1999/10/29 03:04:00 hobbs Exp $
+ * RCS: @(#) $Id: tclEnv.c,v 1.7 2000/04/19 08:32:44 hobbs Exp $
*/
#include "tclInt.h"
@@ -34,6 +34,14 @@ 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>
+char **environ = NULL;
+#endif
+
+/*
* Declarations for local procedures defined in this file:
*/
@@ -80,6 +88,13 @@ 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.