diff options
author | Kevin B Kenny <kennykb@acm.org> | 2004-09-11 18:57:56 (GMT) |
---|---|---|
committer | Kevin B Kenny <kennykb@acm.org> | 2004-09-11 18:57:56 (GMT) |
commit | e1dec685e9bda26a664969e11607fabc328c582c (patch) | |
tree | 1d2452bcda99b379a6cff5ce3eb4924082bc5153 /generic/tclObj.c | |
parent | 80f7a77b4a8d0abf89b50cc8fc656420bde8fed0 (diff) | |
download | tcl-e1dec685e9bda26a664969e11607fabc328c582c.zip tcl-e1dec685e9bda26a664969e11607fabc328c582c.tar.gz tcl-e1dec685e9bda26a664969e11607fabc328c582c.tar.bz2 |
* generic/tclClock.c (TclMktimeObjCmd): Corrected a bad check
for error return from 'mktime'.
* generic/tclObj.c (Tcl_GetIntFromObj): Corrected a problem where
demoting a wide to an int failed on a big-endian machine.
[Bug 1026125].
* tests/clock.test (clock-43.1): Added regression test for
error return from 'mktime'.
Diffstat (limited to 'generic/tclObj.c')
-rw-r--r-- | generic/tclObj.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/generic/tclObj.c b/generic/tclObj.c index 7c9fb47..d681a26 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.65 2004/09/10 22:43:52 dgp Exp $ + * RCS: @(#) $Id: tclObj.c,v 1.66 2004/09/11 18:57:56 kennykb Exp $ */ #include "tclInt.h" @@ -1961,7 +1961,7 @@ Tcl_GetIntFromObj(interp, objPtr, intPtr) } if (((long)((int)l)) == l) { - *intPtr = (int)objPtr->internalRep.longValue; + *intPtr = (int)l; return TCL_OK; } #ifndef TCL_WIDE_INT_IS_LONG |