diff options
| author | Kevin B Kenny <kennykb@acm.org> | 2004-10-27 15:39:11 (GMT) |
|---|---|---|
| committer | Kevin B Kenny <kennykb@acm.org> | 2004-10-27 15:39:11 (GMT) |
| commit | 92c681aa2eddf84cf71f8d3debd36a6d452be888 (patch) | |
| tree | 9edf4167cc20c7609343bf8cb87d71e5789b4249 /generic/tclObj.c | |
| parent | 4955bdc67b8a5c3d9d12cf70cfe0b73c8a4f4ca8 (diff) | |
| download | tcl-92c681aa2eddf84cf71f8d3debd36a6d452be888.zip tcl-92c681aa2eddf84cf71f8d3debd36a6d452be888.tar.gz tcl-92c681aa2eddf84cf71f8d3debd36a6d452be888.tar.bz2 | |
backport fixes for 868489 and 1026125
Diffstat (limited to 'generic/tclObj.c')
| -rw-r--r-- | generic/tclObj.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/generic/tclObj.c b/generic/tclObj.c index 8394f46..9c34908 100644 --- a/generic/tclObj.c +++ b/generic/tclObj.c @@ -11,7 +11,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclObj.c,v 1.42.2.8 2004/09/14 16:30:32 dgp Exp $ + * RCS: @(#) $Id: tclObj.c,v 1.42.2.9 2004/10/27 15:39:36 kennykb Exp $ */ #include "tclInt.h" @@ -1118,11 +1118,7 @@ SetBooleanFromAny(interp, objPtr) } else if (objPtr->typePtr == &tclDoubleType) { newBool = (objPtr->internalRep.doubleValue != 0.0); } else if (objPtr->typePtr == &tclWideIntType) { -#ifdef TCL_WIDE_INT_IS_LONG - newBool = (objPtr->internalRep.longValue != 0); -#else /* !TCL_WIDE_INT_IS_LONG */ - newBool = (objPtr->internalRep.wideValue != Tcl_LongAsWide(0)); -#endif /* TCL_WIDE_INT_IS_LONG */ + newBool = (objPtr->internalRep.wideValue != 0); } else { /* * Copy the string converting its characters to lower case. |