Merge 8.7

7 files changed, 9 insertions, 68 deletions

diff --git a/unix/Makefile.in b/unix/Makefile.in
index a3e822c..ffea44c 100644
--- a/unix/Makefile.in
+++ b/unix/Makefile.in
@@ -2322,7 +2322,8 @@ dist: $(UNIX_DIR)/configure $(UNIX_DIR)/tclConfig.h.in $(UNIX_DIR)/tcl.pc.in gen
 		$(TOP_DIR)/win/tcl.m4 $(TOP_DIR)/win/aclocal.m4 \
 		$(TOP_DIR)/win/tclsh.exe.manifest.in $(TOP_DIR)/win/tclUuid.h.in \
 		$(TOP_DIR)/win/gitmanifest.in $(TOP_DIR)/win/svnmanifest.in \
-		$(DISTDIR)/win
+		$(TOP_DIR)/win/x86_64-w64-mingw32-nmakehlp.exe $(DISTDIR)/win
+	chmod 775 $(DISTDIR)/win/x86_64-w64-mingw32-nmakehlp.exe
 	cp -p $(TOP_DIR)/win/*.[ch] $(TOP_DIR)/win/*.ico $(TOP_DIR)/win/*.rc \
 		$(DISTDIR)/win
 	cp -p $(TOP_DIR)/win/*.bat $(DISTDIR)/win
diff --git a/unix/configure b/unix/configure
index 4a6ee81..5d18196 100755
--- a/unix/configure
+++ b/unix/configure
@@ -6761,11 +6761,11 @@ printf "%s\n" "#define _OE_SOCKETS 1" >>confdefs.h
 	    if test "$SHARED_BUILD" = 1
 then :
 
-	        SHLIB_LD='ld -shared -expect_unresolved "*"'
+	        SHLIB_LD='${CC} -shared'
 
 else $as_nop
 
-	        SHLIB_LD='ld -non_shared -expect_unresolved "*"'
+	        SHLIB_LD='${CC} -non_shared'
 
 fi
 	    SHLIB_SUFFIX=".so"
@@ -10341,47 +10341,6 @@ fi
 
 
 #--------------------------------------------------------------------
-# Check for support of isnan() function or macro
-#--------------------------------------------------------------------
-
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking isnan" >&5
-printf %s "checking isnan... " >&6; }
-if test ${tcl_cv_isnan+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-
-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <math.h>
-int
-main (void)
-{
-
-isnan(0.0);			/* Generates an error if isnan is missing */
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
-  tcl_cv_isnan=yes
-else $as_nop
-  tcl_cv_isnan=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
-    conftest$ac_exeext conftest.$ac_ext
-fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $tcl_cv_isnan" >&5
-printf "%s\n" "$tcl_cv_isnan" >&6; }
-if test $tcl_cv_isnan = no; then
-
-printf "%s\n" "#define NO_ISNAN 1" >>confdefs.h
-
-fi
-
-#--------------------------------------------------------------------
 # Darwin specific API checks and defines
 #--------------------------------------------------------------------
 
diff --git a/unix/configure.ac b/unix/configure.ac
index 335c5a2..7acb5ce 100644
--- a/unix/configure.ac
+++ b/unix/configure.ac
@@ -562,18 +562,6 @@ SC_ENABLE_LANGINFO
 AC_CHECK_FUNCS(cfmakeraw chflags mkstemps)
 
 #--------------------------------------------------------------------
-# Check for support of isnan() function or macro
-#--------------------------------------------------------------------
-
-AC_CACHE_CHECK([isnan], tcl_cv_isnan, [
-    AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <math.h>]], [[
-isnan(0.0);			/* Generates an error if isnan is missing */
-]])],[tcl_cv_isnan=yes],[tcl_cv_isnan=no])])
-if test $tcl_cv_isnan = no; then
-    AC_DEFINE(NO_ISNAN, 1, [Do we have a usable 'isnan'?])
-fi
-
-#--------------------------------------------------------------------
 # Darwin specific API checks and defines
 #--------------------------------------------------------------------
 
diff --git a/unix/tcl.m4 b/unix/tcl.m4
index a5a4884..dfbb9be 100644
--- a/unix/tcl.m4
+++ b/unix/tcl.m4
@@ -1515,9 +1515,9 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
 	    # Digital OSF/1
 	    SHLIB_CFLAGS=""
 	    AS_IF([test "$SHARED_BUILD" = 1], [
-	        SHLIB_LD='ld -shared -expect_unresolved "*"'
+	        SHLIB_LD='${CC} -shared'
 	    ], [
-	        SHLIB_LD='ld -non_shared -expect_unresolved "*"'
+	        SHLIB_LD='${CC} -non_shared'
 	    ])
 	    SHLIB_SUFFIX=".so"
 	    DL_OBJS="tclLoadDl.o"
diff --git a/unix/tclConfig.h.in b/unix/tclConfig.h.in
index 5c24d40..1acc55d 100644
--- a/unix/tclConfig.h.in
+++ b/unix/tclConfig.h.in
@@ -349,9 +349,6 @@
 /* Do we have getwd() */
 #undef NO_GETWD
 
-/* Do we have a usable 'isnan'? */
-#undef NO_ISNAN
-
 /* Do we have memmove()? */
 #undef NO_MEMMOVE
 
diff --git a/unix/tclUnixTime.c b/unix/tclUnixTime.c
index e0c7ac8..6ca641d 100644
--- a/unix/tclUnixTime.c
+++ b/unix/tclUnixTime.c
@@ -155,7 +155,7 @@ TclpGetClicks(void)
 	Tcl_Time time;
 
 	GetTime(&time);
-	now = time.sec*1000000 + time.usec;
+	now = ((unsigned long)(time.sec)*1000000UL) + (unsigned long)(time.usec);
     } else {
 	/*
 	 * A semi-NativeGetTime, specialized to clicks.
@@ -168,7 +168,7 @@ TclpGetClicks(void)
     Tcl_Time time;
 
     GetTime(&time);
-    now = time.sec*1000000 + time.usec;
+    now = ((unsigned long)(time.sec)*1000000UL) + (unsigned long)(time.usec);
 #endif /* NO_GETTOD */
 
     return now;
diff --git a/unix/tclXtNotify.c b/unix/tclXtNotify.c
index 3d90135..0210cd3 100644
--- a/unix/tclXtNotify.c
+++ b/unix/tclXtNotify.c
@@ -193,14 +193,11 @@ InitNotifier(void)
 	return;
     }
 
+    memset(&np, 0, sizeof(np));
     np.createFileHandlerProc = CreateFileHandler;
     np.deleteFileHandlerProc = DeleteFileHandler;
     np.setTimerProc = SetTimer;
     np.waitForEventProc = WaitForEvent;
-    np.initNotifierProc = Tcl_InitNotifier;
-    np.finalizeNotifierProc = Tcl_FinalizeNotifier;
-    np.alertNotifierProc = Tcl_AlertNotifier;
-    np.serviceModeHookProc = Tcl_ServiceModeHook;
     Tcl_SetNotifier(&np);
 
     /*
@@ -209,7 +206,6 @@ InitNotifier(void)
      */
 
     initialized = 1;
-    memset(&np, 0, sizeof(np));
     Tcl_CreateExitHandler(NotifierExitHandler, NULL);
 }