diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2017-04-28 08:00:51 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2017-04-28 08:00:51 (GMT) |
| commit | 2f5a766c71b1796f47a58123f17c3242b607feca (patch) | |
| tree | 6e85f7dd2b98f0c060086540c153617c8b70ae9d /generic/tclExecute.c | |
| parent | ea1a2f3fbf4607b58ceffe3606b2d2e7e59e609f (diff) | |
| parent | 2bf6ae09b3ac48095177c0f52735fb9bfa10f164 (diff) | |
| download | tcl-2f5a766c71b1796f47a58123f17c3242b607feca.zip tcl-2f5a766c71b1796f47a58123f17c3242b607feca.tar.gz tcl-2f5a766c71b1796f47a58123f17c3242b607feca.tar.bz2 | |
merge core-8-6-branch
Diffstat (limited to 'generic/tclExecute.c')
| -rw-r--r-- | generic/tclExecute.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/generic/tclExecute.c b/generic/tclExecute.c index cb4e6dc..d30e757 100644 --- a/generic/tclExecute.c +++ b/generic/tclExecute.c @@ -510,8 +510,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)) \ ? (*(tPtr) = TCL_NUMBER_LONG),TCL_ERROR : \ TclGetNumberFromObj((interp), (objPtr), (ptrPtr), (tPtr))) #else /* !TCL_WIDE_INT_IS_LONG */ @@ -530,8 +529,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)) \ ? (*(tPtr) = TCL_NUMBER_LONG),TCL_ERROR : \ TclGetNumberFromObj((interp), (objPtr), (ptrPtr), (tPtr))) #endif /* TCL_WIDE_INT_IS_LONG */ |