diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2017-05-01 08:47:57 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2017-05-01 08:47:57 (GMT) |
| commit | da02e63f0ab94d965d72f687788adf41de420957 (patch) | |
| tree | 2777253542c057852616cdbdfe6c3261ded7baf8 /generic/tclExecute.c | |
| parent | 76e8da363bc1d0cdfad2b3d1a3e0f8024ff09da1 (diff) | |
| parent | 799554b1c55435a6c7cc1f4529d3e468106b9091 (diff) | |
| download | tcl-da02e63f0ab94d965d72f687788adf41de420957.zip tcl-da02e63f0ab94d965d72f687788adf41de420957.tar.gz tcl-da02e63f0ab94d965d72f687788adf41de420957.tar.bz2 | |
Merge trunk
Diffstat (limited to 'generic/tclExecute.c')
| -rw-r--r-- | generic/tclExecute.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/generic/tclExecute.c b/generic/tclExecute.c index fc2f981..5c701a2 100644 --- a/generic/tclExecute.c +++ b/generic/tclExecute.c @@ -453,8 +453,7 @@ VarHashCreateVar( : (*(tPtr) = TCL_NUMBER_DOUBLE)), \ *(ptrPtr) = (ClientData) \ (&((objPtr)->internalRep.doubleValue)), TCL_OK) : \ - ((((objPtr)->typePtr == NULL) && ((objPtr)->bytes == NULL)) || \ - (((objPtr)->bytes != NULL) && ((objPtr)->length == 0))) \ + (((objPtr)->bytes != NULL) && ((objPtr)->length == 0)) \ ? TCL_ERROR : \ TclGetNumberFromObj((interp), (objPtr), (ptrPtr), (tPtr))) #else /* !TCL_WIDE_INT_IS_LONG */ @@ -473,8 +472,7 @@ VarHashCreateVar( : (*(tPtr) = TCL_NUMBER_DOUBLE)), \ *(ptrPtr) = (ClientData) \ (&((objPtr)->internalRep.doubleValue)), TCL_OK) : \ - ((((objPtr)->typePtr == NULL) && ((objPtr)->bytes == NULL)) || \ - (((objPtr)->bytes != NULL) && ((objPtr)->length == 0))) \ + (((objPtr)->bytes != NULL) && ((objPtr)->length == 0)) \ ? TCL_ERROR : \ TclGetNumberFromObj((interp), (objPtr), (ptrPtr), (tPtr))) #endif /* TCL_WIDE_INT_IS_LONG */ @@ -9090,7 +9088,7 @@ TclCompareTwoNumbers( Tcl_Obj *valuePtr, Tcl_Obj *value2Ptr) { - int type1, type2, compare; + int type1 = TCL_NUMBER_NAN, type2 = TCL_NUMBER_NAN, compare; ClientData ptr1, ptr2; mp_int big1, big2; double d1, d2, tmp; |