diff options
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/tcl.h | 3 | ||||
| -rw-r--r-- | generic/tclLink.c | 4 | ||||
| -rw-r--r-- | generic/tclTomMath.h | 15 |
3 files changed, 17 insertions, 5 deletions
diff --git a/generic/tcl.h b/generic/tcl.h index 8938e4b..c32c063 100644 --- a/generic/tcl.h +++ b/generic/tcl.h @@ -13,7 +13,7 @@ * 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.213 2006/05/30 00:30:25 hobbs Exp $ + * RCS: @(#) $Id: tcl.h,v 1.214 2006/08/18 07:45:31 das Exp $ */ #ifndef _TCL @@ -349,6 +349,7 @@ typedef long LONG; # undef TCL_WIDE_INT_IS_LONG # undef TCL_CFG_DO64BIT # endif /* __LP64__ */ +# undef HAVE_STRUCT_STAT64 #endif /* __APPLE__ */ /* diff --git a/generic/tclLink.c b/generic/tclLink.c index 6a4e49e..7bf4fd5 100644 --- a/generic/tclLink.c +++ b/generic/tclLink.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: tclLink.c,v 1.16 2005/12/13 22:43:18 kennykb Exp $ + * RCS: @(#) $Id: tclLink.c,v 1.17 2006/08/18 07:45:31 das Exp $ */ #include "tclInt.h" @@ -474,7 +474,7 @@ LinkTraceProc( case TCL_LINK_ULONG: if (Tcl_GetWideIntFromObj(interp, valueObj, &valueWide) != TCL_OK - || valueWide < 0 || valueWide > ULONG_MAX) { + || valueWide < 0 || (Tcl_WideUInt) valueWide > ULONG_MAX) { Tcl_ObjSetVar2(interp, linkPtr->varName, NULL, ObjValue(linkPtr), TCL_GLOBAL_ONLY); return "variable must have unsigned long value"; diff --git a/generic/tclTomMath.h b/generic/tclTomMath.h index 2ecc3c5..90d14df 100644 --- a/generic/tclTomMath.h +++ b/generic/tclTomMath.h @@ -56,6 +56,17 @@ extern "C" { #define MP_64BIT #endif #endif +#if defined(__APPLE__) && defined(__LP64__) +/* + * At present, use of 128-bit arithmetic via __attribute__ ((mode(TI))) + * leads to link errors on Darwin x86_64__ and ppc64. rdar://4685527 + */ +# ifdef HAVE_LP64_MODE_TI +# define MP_64BIT +# else +# undef MP_64BIT +# endif +#endif /* some default configurations. * @@ -839,6 +850,6 @@ MODULE_SCOPE const char *mp_s_rmap; /* $Source: /root/tcl/repos-to-convert/tcl/generic/tclTomMath.h,v $ */ -/* $Revision: 1.5 $ */ -/* $Date: 2005/12/13 22:43:18 $ */ +/* $Revision: 1.6 $ */ +/* $Date: 2006/08/18 07:45:31 $ */ |