summaryrefslogtreecommitdiffstats
path: root/unix/tclUnixPort.h
diff options
context:
space:
mode:
authordas <das>2007-08-07 05:04:21 (GMT)
committerdas <das>2007-08-07 05:04:21 (GMT)
commitdb5f2ea3a4f1f2430b9349b6a32c4205c1aba0b3 (patch)
tree174e6ed92cecc0fc88f4748722b54cbff094ba9a /unix/tclUnixPort.h
parent6defebeafdc2b6272b3a90a42a80de6e53225cfc (diff)
downloadtcl-db5f2ea3a4f1f2430b9349b6a32c4205c1aba0b3.zip
tcl-db5f2ea3a4f1f2430b9349b6a32c4205c1aba0b3.tar.gz
tcl-db5f2ea3a4f1f2430b9349b6a32c4205c1aba0b3.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 'unix/tclUnixPort.h')
-rw-r--r--unix/tclUnixPort.h14
1 files changed, 10 insertions, 4 deletions
diff --git a/unix/tclUnixPort.h b/unix/tclUnixPort.h
index 99dc65b..cf0d810 100644
--- a/unix/tclUnixPort.h
+++ b/unix/tclUnixPort.h
@@ -19,7 +19,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclUnixPort.h,v 1.56 2006/11/13 08:23:11 das Exp $
+ * RCS: @(#) $Id: tclUnixPort.h,v 1.57 2007/08/07 05:04:21 das Exp $
*/
#ifndef _TCLUNIXPORT
@@ -484,10 +484,16 @@ extern int errno;
* Variables provided by the C library:
*/
-#if defined(_sgi) || defined(__sgi) || (defined(__APPLE__) && defined(__DYNAMIC__))
-# define environ _environ
-#endif
+#if defined(__APPLE__) && defined(__DYNAMIC__)
+# include <crt_externs.h>
+# define environ (*_NSGetEnviron())
+# define USE_PUTENV 1
+#else
+# if defined(_sgi) || defined(__sgi)
+# define environ _environ
+# endif
extern char **environ;
+#endif
/*
* At present (12/91) not all stdlib.h implementations declare strtod.