merge from 8.5 main branch

FossilOrigin-Name: 5ae53822588e10209ec6dc8ff277dbeb043007ef

4 files changed, 4 insertions, 100 deletions

diff --git a/win/Makefile.in b/win/Makefile.in
index fce519c..b3df47f 100644
--- a/win/Makefile.in
+++ b/win/Makefile.in
@@ -637,8 +637,8 @@ install-libraries: libraries install-tzdata install-msgs
 	    do \
 	    $(COPY) "$$j" "$(SCRIPT_INSTALL_DIR)/http1.0"; \
 	    done;
-	@echo "Installing package http 2.7.7 as a Tcl Module";
-	@$(COPY) $(ROOT_DIR)/library/http/http.tcl $(SCRIPT_INSTALL_DIR)/../tcl8/8.4/http-2.7.7.tm;
+	@echo "Installing package http 2.7.8 as a Tcl Module";
+	@$(COPY) $(ROOT_DIR)/library/http/http.tcl $(SCRIPT_INSTALL_DIR)/../tcl8/8.4/http-2.7.8.tm;
 	@echo "Installing library opt0.4 directory";
 	@for j in $(ROOT_DIR)/library/opt/*.tcl; \
 	    do \
diff --git a/win/configure b/win/configure
index 0e5e92f..07a9436 100755
--- a/win/configure
+++ b/win/configure
@@ -3550,76 +3550,6 @@ _ACEOF
 
 fi
 
-# Check to see if struct _stat32i64 exists in mingw's sys/stat.h
-
-echo "$as_me:$LINENO: checking if struct _stat32i64 missing" >&5
-echo $ECHO_N "checking if struct _stat32i64 missing... $ECHO_C" >&6
-if test "${tcl_struct_stat32i64+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-#include <sys/types.h>
-#include <sys/stat.h>
-
-int
-main ()
-{
-
-  struct _stat32i64 foo;
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  tcl_struct_stat32i64=no
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-tcl_struct_stat32i64=yes
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-
-fi
-echo "$as_me:$LINENO: result: $tcl_struct_stat32i64" >&5
-echo "${ECHO_T}$tcl_struct_stat32i64" >&6
-if test "$tcl_struct_stat32i64" = "yes" ; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_NO_STRUCT_STAT32I64 1
-_ACEOF
-
-fi
-
-
 # See if declarations like FINDEX_INFO_LEVELS are
 # missing from winbase.h. This is known to be
 # a problem with VC++ 5.2.
diff --git a/win/configure.in b/win/configure.in
index 306dbac..1b8c25a 100644
--- a/win/configure.in
+++ b/win/configure.in
@@ -241,26 +241,6 @@ if test "$tcl_cv_cast_to_union" = "yes"; then
             [Defined when compiler supports casting to union type.])
 fi
 
-# Check to see if struct _stat32i64 exists in mingw's sys/stat.h
-
-AC_CACHE_CHECK(if struct _stat32i64 missing,
-    tcl_struct_stat32i64,
-AC_TRY_COMPILE([
-#include <sys/types.h>
-#include <sys/stat.h>
-],
-[
-  struct _stat32i64 foo;
-],
-        tcl_struct_stat32i64=no,
-        tcl_struct_stat32i64=yes)
-)
-if test "$tcl_struct_stat32i64" = "yes" ; then
-    AC_DEFINE(HAVE_NO_STRUCT_STAT32I64, 1,
-            [Defined when sys/stat.h is missing struct _stat32i64])
-fi
-
-
 # See if declarations like FINDEX_INFO_LEVELS are
 # missing from winbase.h. This is known to be
 # a problem with VC++ 5.2.
diff --git a/win/tclWinPort.h b/win/tclWinPort.h
index 493b824..c5a726a 100644
--- a/win/tclWinPort.h
+++ b/win/tclWinPort.h
@@ -108,9 +108,9 @@
 #define ENOTSUP	-1030507
 
 /*
- * Not all mingw32 versions have this struct.
+ * cygwin does not have this struct.
  */
-#if !defined(__BORLANDC__) && !defined(_MSC_VER) && !defined(_WIN64) && defined(HAVE_NO_STRUCT_STAT32I64)
+#ifdef __CYGWIN__
   struct _stat32i64 {
     dev_t st_dev;
     ino_t st_ino;
@@ -120,15 +120,9 @@
     short st_gid;
     dev_t st_rdev;
     __int64 st_size;
-#ifdef __CYGWIN__
     struct {long tv_sec;} st_atim;
     struct {long tv_sec;} st_mtim;
     struct {long tv_sec;} st_ctim;
-#else
-    long st_atime;
-    long st_mtime;
-    long st_ctime;
-#endif
   };
 #endif