merge core-8-branch

14 files changed, 21 insertions, 58 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 93e0ef9..0206fa4 100644
--- a/generic/tclBasic.c
+++ b/generic/tclBasic.c
@@ -7634,7 +7634,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 d166137..97b85de 100644
--- a/generic/tclInt.h
+++ b/generic/tclInt.h
@@ -2876,7 +2876,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/tclListObj.c b/generic/tclListObj.c
index b8f0b74..9f18837 100644
--- a/generic/tclListObj.c
+++ b/generic/tclListObj.c
@@ -136,8 +136,8 @@ NewListIntRep(
  *
  *  AttemptNewList --
  *
- *	Like NewListIntRep, but additionally sets an error message on failure. 
- * 
+ *	Like NewListIntRep, but additionally sets an error message on failure.
+ *
  *----------------------------------------------------------------------
  */
 
@@ -234,12 +234,12 @@ Tcl_NewListObj(
  *----------------------------------------------------------------------
  *
  *  Tcl_DbNewListObj --
- * 
+ *
  *	Like 'Tcl_NewListObj', but it calls Tcl_DbCkalloc directly with the
  *	file name and line number from its caller.  This simplifies debugging
  *	since the [memory active] command will report the correct file
  *	name and line number when reporting objects that haven't been freed.
- * 
+ *
  *	When TCL_MEM_DEBUG is not defined, 'Tcl_NewListObj' is called instead.
  *
  *----------------------------------------------------------------------
@@ -695,7 +695,7 @@ Tcl_ListObjAppendElement(
  *	    object should be treated as readonly and its 'refCount' is _not_
  *	    incremented. The caller must do that if it holds on to the
  *	    reference.
- * 
+ *
  * 	TCL_ERROR
  *
  * 	    'listPtr' is not a valid list. An an error message is left in the
@@ -1337,9 +1337,9 @@ TclLsetList(
  *	    reference. The caller is expected to store the result in the
  *	    variable and decrement its reference count. (INST_STORE_* does
  *	    exactly this.)
- * 
+ *
  *	NULL
- *	
+ *
  *	    An error occurred.  If 'listPtr' was duplicated, the reference
  *	    count on the duplicate is decremented so that it is 0, causing any
  *	    memory allocated by this function to be freed.
diff --git a/generic/tclObj.c b/generic/tclObj.c
index fdbc89a..ab259c2 100644
--- a/generic/tclObj.c
+++ b/generic/tclObj.c
@@ -2477,7 +2477,7 @@ Tcl_SetIntObj(
  *	    Success.
  *
  *	TCL_ERROR
- *	
+ *
  *	    An error occurred during conversion or the integral value can not
  *	    be represented as an integer (it might be too large). An error
  *	    message is left in the interpreter's result if 'interp' is not
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/generic/tclUtil.c b/generic/tclUtil.c
index 0c3f9ac..8ab68d9 100644
--- a/generic/tclUtil.c
+++ b/generic/tclUtil.c
@@ -3470,21 +3470,21 @@ TclFormatInt(
  *
  * Value
  * 	TCL_OK
- *      
+ *
  * 	    The index is stored at the address given by by 'indexPtr'. If
  * 	    'objPtr' has the value "end", the value stored is 'endValue'.
- * 
+ *
  * 	TCL_ERROR
- *      
+ *
  * 	    The value of 'objPtr' does not have one of the expected formats. If
  * 	    'interp' is non-NULL, an error message is left in the interpreter's
  * 	    result object.
- * 
+ *
  * Effect
- * 
+ *
  * 	The object referenced by 'objPtr' is converted, as needed, to an
  * 	integer, wide integer, or end-based-index object.
- * 
+ *
  *----------------------------------------------------------------------
  */
 
diff --git a/tests/var.test b/tests/var.test
index e32dbcf..6be22fa 100644
--- a/tests/var.test
+++ b/tests/var.test
@@ -247,7 +247,7 @@ test var-3.4 {MakeUpvar, my var has TCL_NAMESPACE_ONLY specified} -setup {
 	catch {unset ::test_ns_var::vv}
 	proc p {} {
 	    # create namespace var vv linked to global a
-	    testupvar 2 a {} vv namespace 
+	    testupvar 2 a {} vv namespace
 	}
 	p
     }
diff --git a/unix/configure b/unix/configure
index 6b9cedf..f4ae27f 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 */