summaryrefslogtreecommitdiffstats
path: root/generic/tkConfig.c
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2022-02-02 13:59:27 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2022-02-02 13:59:27 (GMT)
commit309c748ad6d849d9cdb327bed24cff7e04f7ebd0 (patch)
tree8f5f69d899ff3d0ddcb6e149a318a28079d20d39 /generic/tkConfig.c
parent484e5eae39b0fecf25cfe5122d34c3d0720eb12c (diff)
downloadtk-309c748ad6d849d9cdb327bed24cff7e04f7ebd0.zip
tk-309c748ad6d849d9cdb327bed24cff7e04f7ebd0.tar.gz
tk-309c748ad6d849d9cdb327bed24cff7e04f7ebd0.tar.bz2
Oops 2
Diffstat (limited to 'generic/tkConfig.c')
-rw-r--r--generic/tkConfig.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/generic/tkConfig.c b/generic/tkConfig.c
index 650e7e1..9b83e38 100644
--- a/generic/tkConfig.c
+++ b/generic/tkConfig.c
@@ -679,13 +679,12 @@ DoObjConfig(
if (nullOK && ObjectIsEmpty(valuePtr)) {
valuePtr = NULL;
-#if (TCL_MAJOR_VERSION > 8 || defined(TK_NO_DEPRECATED)) && defined(NAN)
+#if defined(NAN)
if (optionPtr->specPtr->flags & TK_OPTION_NULL_OK) {
newDbl = NAN;
} else
-#else
- newDbl = 0.0;
#endif
+ newDbl = 0.0;
} else {
if (Tcl_GetDoubleFromObj(nullOK ? NULL : interp, valuePtr, &newDbl) != TCL_OK) {
if (nullOK && interp) {