From e79404a6ffe899d49d9edfd38dc9560e989c335e Mon Sep 17 00:00:00 2001 From: das Date: Wed, 14 Jun 2006 21:12:18 +0000 Subject: * unix/tclUnixPort.h (Darwin): support for MAC_OS_X_VERSION_MAX_ALLOWED define from AvailabilityMacros.h: override configure detection and only use API available in the indicated OS version or earlier. --- ChangeLog | 6 ++++++ unix/tclUnixPort.h | 37 +++++++++++++++++++++++++++---------- 2 files changed, 33 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0f64b36..923b037 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2006-06-14 Daniel Steffen + + * unix/tclUnixPort.h (Darwin): support for MAC_OS_X_VERSION_MAX_ALLOWED + define from AvailabilityMacros.h: override configure detection and only + use API available in the indicated OS version or earlier. + 2006-06-14 Pat Thoyts * generic/regerror.c: Enable building Tcl with Microsoft's diff --git a/unix/tclUnixPort.h b/unix/tclUnixPort.h index 5c4b195..6c57a3b 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.9 2005/12/06 09:01:07 das Exp $ + * RCS: @(#) $Id: tclUnixPort.h,v 1.27.2.10 2006/06/14 21:12:19 das Exp $ */ #ifndef _TCLUNIXPORT @@ -505,25 +505,42 @@ extern double strtod(); #define TclpPanic ((Tcl_PanicProc *) NULL) /* - * Darwin specifc configure overrides (to support fat compiles, where - * configure runs only once for multiple architectures): + * Darwin specifc configure overrides. */ #ifdef __APPLE__ +/* + * Support for fat compiles: configure runs only once for multiple architectures + */ # ifdef __LP64__ # undef HAVE_COREFOUNDATION # endif /* __LP64__ */ # include -# if defined(__DARWIN_UNIX03) +# ifdef __DARWIN_UNIX03 # if __DARWIN_UNIX03 # undef HAVE_PUTENV_THAT_COPIES -# else /* !__DARWIN_UNIX03 */ +# else # define HAVE_PUTENV_THAT_COPIES 1 -# endif /* __DARWIN_UNIX03 */ -# define USE_TERMIOS 1 -# undef USE_TERMIO -# undef USE_SGTTY -# endif /* defined(__DARWIN_UNIX03) */ +# endif +# define USE_TERMIOS 1 +# undef USE_TERMIO +# undef USE_SGTTY +# endif /* __DARWIN_UNIX03 */ +/* + * Support for MAC_OS_X_VERSION_MAX_ALLOWED define from AvailabilityMacros.h: + * only use API available in the indicated OS version or earlier. + */ +# ifdef MAC_OS_X_VERSION_MAX_ALLOWED +# if MAC_OS_X_VERSION_MAX_ALLOWED < 1040 +# undef HAVE_OSSPINLOCKLOCK +# undef HAVE_PTHREAD_ATFORK +# undef HAVE_COPYFILE +# endif +# if MAC_OS_X_VERSION_MAX_ALLOWED < 1030 +# define NO_REALPATH 1 +# undef HAVE_LANGINFO +# endif +# endif /* MAC_OS_X_VERSION_MAX_ALLOWED */ #endif /* __APPLE__ */ /* -- cgit v0.12