Merge 8.7. Finish implementation.

4 files changed, 9 insertions, 15 deletions

diff --git a/win/Makefile.in b/win/Makefile.in
index 3a179b4..8057683 100644
--- a/win/Makefile.in
+++ b/win/Makefile.in
@@ -380,17 +380,14 @@ TOMMATH_OBJS = \
 	bn_mp_exch.${OBJEXT} \
 	bn_mp_expt_u32.${OBJEXT} \
 	bn_mp_get_mag_u64.${OBJEXT} \
-	bn_mp_get_mag_ul.${OBJEXT} \
 	bn_mp_grow.${OBJEXT} \
 	bn_mp_init.${OBJEXT} \
 	bn_mp_init_copy.${OBJEXT} \
 	bn_mp_init_i64.${OBJEXT} \
-	bn_mp_init_l.${OBJEXT} \
 	bn_mp_init_multi.${OBJEXT} \
 	bn_mp_init_set.${OBJEXT} \
 	bn_mp_init_size.${OBJEXT} \
 	bn_mp_init_u64.${OBJEXT} \
-	bn_mp_init_ul.${OBJEXT} \
 	bn_mp_lshd.${OBJEXT} \
 	bn_mp_mod.${OBJEXT} \
 	bn_mp_mod_2d.${OBJEXT} \
@@ -404,11 +401,8 @@ TOMMATH_OBJS = \
 	bn_mp_radix_smap.${OBJEXT} \
 	bn_mp_read_radix.${OBJEXT} \
 	bn_mp_rshd.${OBJEXT} \
-	bn_mp_set.${OBJEXT} \
 	bn_mp_set_i64.${OBJEXT} \
-	bn_mp_set_l.${OBJEXT} \
 	bn_mp_set_u64.${OBJEXT} \
-	bn_mp_set_ul.${OBJEXT} \
 	bn_mp_shrink.${OBJEXT} \
 	bn_mp_sqr.${OBJEXT} \
 	bn_mp_sqrt.${OBJEXT} \
@@ -914,6 +908,7 @@ install-headers:
 		$(GENERIC_DIR)/tclPlatDecls.h \
 		$(GENERIC_DIR)/tclTomMath.h \
 		$(GENERIC_DIR)/tclTomMathDecls.h ; \
+		$(TOMMATH_DIR)/tommath.h ; \
 	    do \
 	    $(COPY) $$i "$(INCLUDE_INSTALL_DIR)"; \
 	    done;
diff --git a/win/makefile.vc b/win/makefile.vc
index cd7e6ba..743487e 100644
--- a/win/makefile.vc
+++ b/win/makefile.vc
@@ -337,17 +337,14 @@ TOMMATHOBJS = \
 	$(TMP_DIR)\bn_mp_exch.obj \

 	$(TMP_DIR)\bn_mp_expt_u32.obj \

 	$(TMP_DIR)\bn_mp_get_mag_u64.obj \

-	$(TMP_DIR)\bn_mp_get_mag_ul.obj \

 	$(TMP_DIR)\bn_mp_grow.obj \

 	$(TMP_DIR)\bn_mp_init.obj \

 	$(TMP_DIR)\bn_mp_init_copy.obj \

 	$(TMP_DIR)\bn_mp_init_i64.obj \

-	$(TMP_DIR)\bn_mp_init_l.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_u64.obj \

-	$(TMP_DIR)\bn_mp_init_ul.obj \

 	$(TMP_DIR)\bn_mp_lshd.obj \

 	$(TMP_DIR)\bn_mp_mod.obj \

 	$(TMP_DIR)\bn_mp_mod_2d.obj \

@@ -361,11 +358,8 @@ TOMMATHOBJS = \
 	$(TMP_DIR)\bn_mp_radix_smap.obj \

 	$(TMP_DIR)\bn_mp_read_radix.obj \

 	$(TMP_DIR)\bn_mp_rshd.obj \

-	$(TMP_DIR)\bn_mp_set.obj \

 	$(TMP_DIR)\bn_mp_set_i64.obj \

-	$(TMP_DIR)\bn_mp_set_l.obj \

 	$(TMP_DIR)\bn_mp_set_u64.obj \

-	$(TMP_DIR)\bn_mp_set_ul.obj \

 	$(TMP_DIR)\bn_mp_shrink.obj \

 	$(TMP_DIR)\bn_mp_sqr.obj \

 	$(TMP_DIR)\bn_mp_sqrt.obj \

@@ -892,8 +886,7 @@ install-libraries: tclConfig tcl-nmake install-msgs install-tzdata
 	@$(CPY) "$(GENERICDIR)\tclPlatDecls.h"    "$(INCLUDE_INSTALL_DIR)\"

 	@$(CPY) "$(GENERICDIR)\tclTomMath.h"      "$(INCLUDE_INSTALL_DIR)\"

 	@$(CPY) "$(GENERICDIR)\tclTomMathDecls.h" "$(INCLUDE_INSTALL_DIR)\"

-	@$(CPY) "$(TOMMATHDIR)\tommath_class.h"   "$(INCLUDE_INSTALL_DIR)\"

-	@$(CPY) "$(TOMMATHDIR)\tommath_superclass.h" "$(INCLUDE_INSTALL_DIR)\"

+	@$(CPY) "$(TOMMATHDIR)\tommath.h"         "$(INCLUDE_INSTALL_DIR)\"

 	@echo Installing library files to $(SCRIPT_INSTALL_DIR)

 	@$(CPY) "$(ROOT)\library\history.tcl"     "$(SCRIPT_INSTALL_DIR)\"

 	@$(CPY) "$(ROOT)\library\init.tcl"        "$(SCRIPT_INSTALL_DIR)\"

diff --git a/win/rules.vc b/win/rules.vc
index 2b11b01..cd3b035 100644
--- a/win/rules.vc
+++ b/win/rules.vc
@@ -1324,7 +1324,7 @@ OPTDEFINES	= $(OPTDEFINES) /DTCL_UTF_MAX=6
 !endif

 

 # _ATL_XP_TARGETING - Newer SDK's need this to build for XP

-COMPILERFLAGS  = /D_ATL_XP_TARGETING

+COMPILERFLAGS  = /D_ATL_XP_TARGETING=1 /DMP_32BIT=1

 

 # Like the TEA system only set this non empty for non-Tk extensions

 # Note: some extensions use PACKAGE_NAME and others use PACKAGE_TCLNAME

diff --git a/win/tclWinPort.h b/win/tclWinPort.h
index 306e943..b43316a 100644
--- a/win/tclWinPort.h
+++ b/win/tclWinPort.h
@@ -19,6 +19,9 @@
 /* See [Bug 3354324]: file mtime sets wrong time */
 #   define __MINGW_USE_VC2005_COMPAT
 #endif
+#if defined(_MSC_VER) && defined(_WIN64) && !defined(MP_32BIT) && !defined(STATIC_BUILD)
+#   define MP_64BIT
+#endif
 
 /*
  * We must specify the lower version we intend to support.
@@ -83,6 +86,9 @@ typedef DWORD_PTR * PDWORD_PTR;
 #include <malloc.h>
 #include <process.h>
 #include <signal.h>
+#if HAVE_INTTYPES_H
+#   include <inttypes.h>
+#endif
 #include <limits.h>
 #ifdef HAVE_STDINT_H
 #   include <stdint.h>