diff options
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/tcl.h | 9 | ||||
| -rw-r--r-- | generic/tclEnv.c | 17 |
2 files changed, 21 insertions, 5 deletions
diff --git a/generic/tcl.h b/generic/tcl.h index 3e49b10..cccf9f6 100644 --- a/generic/tcl.h +++ b/generic/tcl.h @@ -7,12 +7,12 @@ * Copyright (c) 1987-1994 The Regents of the University of California. * Copyright (c) 1993-1996 Lucent Technologies. * Copyright (c) 1994-1998 Sun Microsystems, Inc. - * Copyright (c) 1998-1999 by Scriptics Corporation. + * Copyright (c) 1998-2000 by Scriptics Corporation. * * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tcl.h,v 1.69 2000/04/17 20:32:21 welch Exp $ + * RCS: @(#) $Id: tcl.h,v 1.70 2000/04/19 08:32:44 hobbs Exp $ */ #ifndef _TCL @@ -49,6 +49,7 @@ extern "C" { * win/README.binary (sections 0-4) * win/README (not patchlevel) (sections 0 and 2) * unix/README (not patchlevel) (part (h)) + * unix/tcl.spec (2 LOC Major/Minor, 1 LOC patch) * tests/basic.test (not patchlevel) (version checks) * tools/tcl.hpj.in (not patchlevel, for windows installer) * tools/tcl.wse.in (for windows installer) @@ -58,10 +59,10 @@ extern "C" { #define TCL_MAJOR_VERSION 8 #define TCL_MINOR_VERSION 3 #define TCL_RELEASE_LEVEL TCL_FINAL_RELEASE -#define TCL_RELEASE_SERIAL 0 +#define TCL_RELEASE_SERIAL 1 #define TCL_VERSION "8.3" -#define TCL_PATCH_LEVEL "8.3.0" +#define TCL_PATCH_LEVEL "8.3.1" /* * The following definitions set up the proper options for Windows 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. |