summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2017-11-15 09:42:07 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2017-11-15 09:42:07 (GMT)
commit346cce57455de92d12fcef5ea4115a9657458b84 (patch)
tree62153fbab1b634ba4e9a9b9e0c15c0d394aa4127
parente3439b6af28680828231cfcf081ebb618ac1740f (diff)
downloadtcl-346cce57455de92d12fcef5ea4115a9657458b84.zip
tcl-346cce57455de92d12fcef5ea4115a9657458b84.tar.gz
tcl-346cce57455de92d12fcef5ea4115a9657458b84.tar.bz2
Remove compat/float.h and related machinery. The last system known where this was needed was SunOS-4, which is not supported by Tcl any more for a long ... long time ....
Also, fix a typo in generic/tclInt.h and remove some end-of-line spacing.
-rw-r--r--compat/float.h14
-rw-r--r--generic/tclBasic.c2
-rw-r--r--generic/tclInt.h2
-rw-r--r--generic/tclPkg.c6
-rwxr-xr-xunix/configure10
-rw-r--r--unix/tcl.m41
-rw-r--r--unix/tclConfig.h.in3
-rw-r--r--unix/tclUnixPort.h5
-rw-r--r--win/tcl.dsp4
-rw-r--r--win/tclWinThrd.c2
10 files changed, 6 insertions, 43 deletions
diff --git a/compat/float.h b/compat/float.h
deleted file mode 100644
index 411edbf..0000000
--- a/compat/float.h
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
- * float.h --
- *
- * This is a dummy header file to #include in Tcl when there
- * is no float.h in /usr/include. Right now this file is empty:
- * Tcl contains #ifdefs to deal with the lack of definitions;
- * all it needs is for the #include statement to work.
- *
- * Copyright (c) 1993 The Regents of the University of California.
- * Copyright (c) 1994 Sun Microsystems, Inc.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- */
diff --git a/generic/tclBasic.c b/generic/tclBasic.c
index e6022ac..fe29db0 100644
--- a/generic/tclBasic.c
+++ b/generic/tclBasic.c
@@ -7722,7 +7722,7 @@ ExprRandFunc(
iPtr->flags |= RAND_SEED_INITIALIZED;
/*
- * To ensure different seeds in different threads (bug #416643),
+ * To ensure different seeds in different threads (bug #416643),
* take into consideration the thread this interp is running in.
*/
diff --git a/generic/tclInt.h b/generic/tclInt.h
index 6426c21..23a20e6 100644
--- a/generic/tclInt.h
+++ b/generic/tclInt.h
@@ -2922,7 +2922,7 @@ MODULE_SCOPE int TclFindDictElement(Tcl_Interp *interp,
const char *dict, int dictLength,
const char **elementPtr, const char **nextPtr,
int *sizePtr, int *literalPtr);
-/* TIP #280 - Modified token based evulation, with line information. */
+/* TIP #280 - Modified token based evaluation, with line information. */
MODULE_SCOPE int TclEvalEx(Tcl_Interp *interp, const char *script,
int numBytes, int flags, int line,
int *clNextOuter, const char *outerScript);
diff --git a/generic/tclPkg.c b/generic/tclPkg.c
index ea95320..fb721a0 100644
--- a/generic/tclPkg.c
+++ b/generic/tclPkg.c
@@ -480,7 +480,7 @@ PkgRequireCore(
continue;
}
-
+
/* Check satisfaction of requirements before considering the current version further. */
if (reqc > 0) {
satisfies = SomeRequirementSatisfied(availVersion, reqc, reqv);
@@ -490,7 +490,7 @@ PkgRequireCore(
continue;
}
}
-
+
if (bestPtr != NULL) {
int res = CompareVersions(availVersion, bestVersion, NULL);
@@ -547,7 +547,7 @@ PkgRequireCore(
/*
* Clean up memorized internal reps, if any.
*/
-
+
if (bestVersion != NULL) {
ckfree(bestVersion);
bestVersion = NULL;
diff --git a/unix/configure b/unix/configure
index 129c283..51d694f 100755
--- a/unix/configure
+++ b/unix/configure
@@ -3733,16 +3733,6 @@ $as_echo "#define NO_DIRENT_H 1" >>confdefs.h
fi
- ac_fn_c_check_header_mongrel "$LINENO" "float.h" "ac_cv_header_float_h" "$ac_includes_default"
-if test "x$ac_cv_header_float_h" = xyes; then :
-
-else
-
-$as_echo "#define NO_FLOAT_H 1" >>confdefs.h
-
-fi
-
-
ac_fn_c_check_header_mongrel "$LINENO" "values.h" "ac_cv_header_values_h" "$ac_includes_default"
if test "x$ac_cv_header_values_h" = xyes; then :
diff --git a/unix/tcl.m4 b/unix/tcl.m4
index 45922e0..9aa3eb2 100644
--- a/unix/tcl.m4
+++ b/unix/tcl.m4
@@ -2078,7 +2078,6 @@ closedir(d);
AC_DEFINE(NO_DIRENT_H, 1, [Do we have <dirent.h>?])
fi
- AC_CHECK_HEADER(float.h, , [AC_DEFINE(NO_FLOAT_H, 1, [Do we have <float.h>?])])
AC_CHECK_HEADER(values.h, , [AC_DEFINE(NO_VALUES_H, 1, [Do we have <values.h>?])])
AC_CHECK_HEADER(stdlib.h, tcl_ok=1, tcl_ok=0)
AC_EGREP_HEADER(strtol, stdlib.h, , tcl_ok=0)
diff --git a/unix/tclConfig.h.in b/unix/tclConfig.h.in
index adbc80d..28ce012 100644
--- a/unix/tclConfig.h.in
+++ b/unix/tclConfig.h.in
@@ -295,9 +295,6 @@
/* Do we have fd_set? */
#undef NO_FD_SET
-/* Do we have <float.h>? */
-#undef NO_FLOAT_H
-
/* Do we have fstatfs()? */
#undef NO_FSTATFS
diff --git a/unix/tclUnixPort.h b/unix/tclUnixPort.h
index ba56089..8b766d6 100644
--- a/unix/tclUnixPort.h
+++ b/unix/tclUnixPort.h
@@ -181,13 +181,10 @@ extern int TclUnixSetBlockingMode(int fd, int mode);
*---------------------------------------------------------------------------
*/
-#ifndef NO_FLOAT_H
-# include <float.h>
-#else
+#include <float.h>
#ifndef NO_VALUES_H
# include <values.h>
#endif
-#endif
#ifndef FLT_MAX
# ifdef MAXFLOAT
diff --git a/win/tcl.dsp b/win/tcl.dsp
index 48eae9d..ad9c764 100644
--- a/win/tcl.dsp
+++ b/win/tcl.dsp
@@ -152,10 +152,6 @@ SOURCE=..\compat\fixstrtod.c
# End Source File
# Begin Source File
-SOURCE=..\compat\float.h
-# End Source File
-# Begin Source File
-
SOURCE=..\compat\gettod.c
# End Source File
# Begin Source File
diff --git a/win/tclWinThrd.c b/win/tclWinThrd.c
index b9cde72..8c130a7 100644
--- a/win/tclWinThrd.c
+++ b/win/tclWinThrd.c
@@ -13,8 +13,6 @@
#include "tclWinInt.h"
-#include <float.h>
-
/* Workaround for mingw versions which don't provide this in float.h */
#ifndef _MCW_EM
# define _MCW_EM 0x0008001F /* Error masks */