diff options
Diffstat (limited to 'unix')
| -rw-r--r-- | unix/tclUnixInit.c | 8 | ||||
| -rw-r--r-- | unix/tclUnixPort.h | 9 |
2 files changed, 12 insertions, 5 deletions
diff --git a/unix/tclUnixInit.c b/unix/tclUnixInit.c index 5be58f5..53853df 100644 --- a/unix/tclUnixInit.c +++ b/unix/tclUnixInit.c @@ -7,7 +7,7 @@ * Copyright (c) 1999 by Scriptics Corporation. * All rights reserved. * - * RCS: @(#) $Id: tclUnixInit.c,v 1.34 2002/10/22 16:41:28 das Exp $ + * RCS: @(#) $Id: tclUnixInit.c,v 1.35 2003/05/13 08:40:31 das Exp $ */ #if defined(HAVE_CFBUNDLE) @@ -1027,7 +1027,7 @@ TclpCheckStackSpace() * TCL_OK if we have found the tcl library; TCL_ERROR otherwise. * * Side effects: - * Same as for Tcl_MacOSXOpenBundleResources. + * Same as for Tcl_MacOSXOpenVersionedBundleResources. * *---------------------------------------------------------------------- */ @@ -1035,8 +1035,8 @@ static int Tcl_MacOSXGetLibraryPath(Tcl_Interp *interp, int maxPathLen, char *tc { int foundInFramework = TCL_ERROR; if (strcmp(defaultLibraryDir, "@TCL_IN_FRAMEWORK@") == 0) { - foundInFramework = Tcl_MacOSXOpenBundleResources(interp, - "com.tcltk.tcllibrary", 0, maxPathLen, tclLibPath); + foundInFramework = Tcl_MacOSXOpenVersionedBundleResources(interp, + "com.tcltk.tcllibrary", TCL_VERSION, 0, maxPathLen, tclLibPath); } return foundInFramework; } diff --git a/unix/tclUnixPort.h b/unix/tclUnixPort.h index 511e09b..396b7df 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 2003/02/20 00:34:09 hobbs Exp $ + * RCS: @(#) $Id: tclUnixPort.h,v 1.28 2003/05/13 08:40:31 das Exp $ */ #ifndef _TCLUNIXPORT @@ -571,6 +571,13 @@ EXTERN char * TclpInetNtoa(struct in_addr); #define inet_ntoa(x) TclpInetNtoa(x) #undef TclOSreaddir #define TclOSreaddir(x) TclpReaddir(x) +#ifdef MAC_OSX_TCL +/* + * On Mac OS X, realpath is currently not + * thread safe, c.f. SF bug # 711232. + */ +#define NO_REALPATH +#endif #else typedef int TclpMutex; #define TclpMutexInit(a) |