Merge 8.7

4 files changed, 13 insertions, 3 deletions

diff --git a/win/Makefile.in b/win/Makefile.in
index 8c8ed44..55744eb 100644
--- a/win/Makefile.in
+++ b/win/Makefile.in
@@ -384,10 +384,13 @@ TOMMATH_OBJS = \
 	bn_mp_grow.${OBJEXT} \
 	bn_mp_init.${OBJEXT} \
 	bn_mp_init_copy.${OBJEXT} \
+	bn_mp_init_l.${OBJEXT} \
+	bn_mp_init_ll.${OBJEXT} \
 	bn_mp_init_multi.${OBJEXT} \
 	bn_mp_init_set.${OBJEXT} \
 	bn_mp_init_size.${OBJEXT} \
 	bn_mp_init_ul.${OBJEXT} \
+	bn_mp_init_ull.${OBJEXT} \
 	bn_mp_lshd.${OBJEXT} \
 	bn_mp_mod.${OBJEXT} \
 	bn_mp_mod_2d.${OBJEXT} \
@@ -402,6 +405,7 @@ TOMMATH_OBJS = \
 	bn_mp_read_radix.${OBJEXT} \
 	bn_mp_rshd.${OBJEXT} \
 	bn_mp_set.${OBJEXT} \
+	bn_mp_set_l.${OBJEXT} \
 	bn_mp_set_ul.${OBJEXT} \
 	bn_mp_shrink.${OBJEXT} \
 	bn_mp_sqr.${OBJEXT} \
diff --git a/win/makefile.vc b/win/makefile.vc
index 19911fd..216d5d9 100644
--- a/win/makefile.vc
+++ b/win/makefile.vc
@@ -340,10 +340,13 @@ TOMMATHOBJS = \
 	$(TMP_DIR)\bn_mp_grow.obj \

 	$(TMP_DIR)\bn_mp_init.obj \

 	$(TMP_DIR)\bn_mp_init_copy.obj \

+	$(TMP_DIR)\bn_mp_init_l.obj \

+	$(TMP_DIR)\bn_mp_init_ll.obj \

 	$(TMP_DIR)\bn_mp_init_multi.obj \

 	$(TMP_DIR)\bn_mp_init_set.obj \

 	$(TMP_DIR)\bn_mp_init_size.obj \

 	$(TMP_DIR)\bn_mp_init_ul.obj \

+	$(TMP_DIR)\bn_mp_init_ull.obj \

 	$(TMP_DIR)\bn_mp_lshd.obj \

 	$(TMP_DIR)\bn_mp_mod.obj \

 	$(TMP_DIR)\bn_mp_mod_2d.obj \

@@ -358,6 +361,7 @@ TOMMATHOBJS = \
 	$(TMP_DIR)\bn_mp_read_radix.obj \

 	$(TMP_DIR)\bn_mp_rshd.obj \

 	$(TMP_DIR)\bn_mp_set.obj \

+	$(TMP_DIR)\bn_mp_set_l.obj \

 	$(TMP_DIR)\bn_mp_set_ul.obj \

 	$(TMP_DIR)\bn_mp_shrink.obj \

 	$(TMP_DIR)\bn_mp_sqr.obj \

diff --git a/win/tclWinFile.c b/win/tclWinFile.c
index 880adc0..7699f7d 100644
--- a/win/tclWinFile.c
+++ b/win/tclWinFile.c
@@ -2542,8 +2542,9 @@ TclpFilesystemPathType(
 int
 TclpObjNormalizePath(
     Tcl_Interp *interp,
-    Tcl_Obj *pathPtr,
-    int nextCheckpoint)
+    Tcl_Obj *pathPtr,	        /* An unshared object containing the path to
+				 * normalize */
+    int nextCheckpoint)	        /* offset to start at in pathPtr */
 {
     char *lastValidPathEnd = NULL;
     Tcl_DString dsNorm;		/* This will hold the normalized string. */
@@ -3032,7 +3033,7 @@ TclpNativeToNormalized(
  *	The nativePath representation.
  *
  * Side effects:
- *	Memory will be allocated. The path may need to be normalized.
+ *	Memory will be allocated. The path might be normalized.
  *
  *---------------------------------------------------------------------------
  */
diff --git a/win/tclWinPort.h b/win/tclWinPort.h
index 1946adb..6b27d16 100644
--- a/win/tclWinPort.h
+++ b/win/tclWinPort.h
@@ -476,6 +476,7 @@ typedef DWORD_PTR * PDWORD_PTR;
  * (_MSC_VER is 1200 for VC6, 1300 or 1310 for vc7.net, 1400 for 8.0)
  */
 #if defined(_MSC_VER)
+#   pragma warning(disable:4146)
 #   pragma warning(disable:4244)
 #   if _MSC_VER >= 1400
 #	pragma warning(disable:4267)