summaryrefslogtreecommitdiffstats
path: root/unix/tclUnixPort.h
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2007-09-04 17:43:42 (GMT)
committerdgp <dgp@users.sourceforge.net>2007-09-04 17:43:42 (GMT)
commit6071dd54232192dfc2f58917e4e64fd8d3940368 (patch)
tree6bd7a89eb2e5d78bce73e0e1b76b8e8683e5a5b3 /unix/tclUnixPort.h
parente0cfac8e8cf8670ea3513386a39250c155c0e22f (diff)
downloadtcl-6071dd54232192dfc2f58917e4e64fd8d3940368.zip
tcl-6071dd54232192dfc2f58917e4e64fd8d3940368.tar.gz
tcl-6071dd54232192dfc2f58917e4e64fd8d3940368.tar.bz2
merge updates from HEAD
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..cd01440 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.56.2.1 2007/09/04 17:44:23 dgp 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.