diff options
| author | das <das> | 2007-08-07 05:04:48 (GMT) |
|---|---|---|
| committer | das <das> | 2007-08-07 05:04:48 (GMT) |
| commit | 34d95ab0f6f686309ce09ec37889afc625f25149 (patch) | |
| tree | 3bbf2749497a8d2a6bce94be18b879e1fec2b0ca /unix/tclUnixPort.h | |
| parent | 5bd8a0386d769f512da9dab55cd949fd0d8329bc (diff) | |
| download | tcl-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 'unix/tclUnixPort.h')
| -rw-r--r-- | unix/tclUnixPort.h | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/unix/tclUnixPort.h b/unix/tclUnixPort.h index d98e8e4..203d319 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.27.2.18 2007/04/21 22:42:49 kennykb Exp $ + * RCS: @(#) $Id: tclUnixPort.h,v 1.27.2.19 2007/08/07 05:04:48 das Exp $ */ #ifndef _TCLUNIXPORT @@ -491,10 +491,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. |