Merge trunk

6 files changed, 20 insertions, 10 deletions

diff --git a/win/Makefile.in b/win/Makefile.in
index 24cb5b2..a3275ba 100644
--- a/win/Makefile.in
+++ b/win/Makefile.in
@@ -329,6 +329,9 @@ TOMMATH_OBJS = \
 	bn_mp_exch.${OBJEXT} \
 	bn_mp_expt_d.${OBJEXT} \
 	bn_mp_expt_d_ex.${OBJEXT} \
+	bn_mp_get_int.${OBJEXT} \
+	bn_mp_get_long.${OBJEXT} \
+	bn_mp_get_long_long.${OBJEXT} \
 	bn_mp_grow.${OBJEXT} \
 	bn_mp_init.${OBJEXT} \
 	bn_mp_init_copy.${OBJEXT} \
@@ -353,6 +356,8 @@ TOMMATH_OBJS = \
 	bn_mp_rshd.${OBJEXT} \
 	bn_mp_set.${OBJEXT} \
 	bn_mp_set_int.${OBJEXT} \
+	bn_mp_set_long.${OBJEXT} \
+	bn_mp_set_long_long.${OBJEXT} \
 	bn_mp_shrink.${OBJEXT} \
 	bn_mp_sqr.${OBJEXT} \
 	bn_mp_sqrt.${OBJEXT} \
diff --git a/win/configure b/win/configure
index d0431cb..fdd3adb 100755
--- a/win/configure
+++ b/win/configure
@@ -2102,7 +2102,7 @@ SHELL=/bin/sh
 TCL_VERSION=8.7
 TCL_MAJOR_VERSION=8
 TCL_MINOR_VERSION=7
-TCL_PATCH_LEVEL="a0"
+TCL_PATCH_LEVEL="a2"
 VER=$TCL_MAJOR_VERSION$TCL_MINOR_VERSION
 
 TCL_DDE_VERSION=1.4
diff --git a/win/configure.ac b/win/configure.ac
index 2821bc3..d03695c 100644
--- a/win/configure.ac
+++ b/win/configure.ac
@@ -14,7 +14,7 @@ SHELL=/bin/sh
 TCL_VERSION=8.7
 TCL_MAJOR_VERSION=8
 TCL_MINOR_VERSION=7
-TCL_PATCH_LEVEL="a0"
+TCL_PATCH_LEVEL="a2"
 VER=$TCL_MAJOR_VERSION$TCL_MINOR_VERSION
 
 TCL_DDE_VERSION=1.4
diff --git a/win/makefile.vc b/win/makefile.vc
index 5566df2..2bff871 100644
--- a/win/makefile.vc
+++ b/win/makefile.vc
@@ -384,6 +384,9 @@ TOMMATHOBJS = \
 	$(TMP_DIR)\bn_mp_exch.obj \

 	$(TMP_DIR)\bn_mp_expt_d.obj \

 	$(TMP_DIR)\bn_mp_expt_d_ex.obj \

+	$(TMP_DIR)\bn_mp_get_int.obj \

+	$(TMP_DIR)\bn_mp_get_long.obj \

+	$(TMP_DIR)\bn_mp_get_long_long.obj \

 	$(TMP_DIR)\bn_mp_grow.obj \

 	$(TMP_DIR)\bn_mp_init.obj \

 	$(TMP_DIR)\bn_mp_init_copy.obj \

@@ -408,6 +411,8 @@ TOMMATHOBJS = \
 	$(TMP_DIR)\bn_mp_rshd.obj \

 	$(TMP_DIR)\bn_mp_set.obj \

 	$(TMP_DIR)\bn_mp_set_int.obj \

+	$(TMP_DIR)\bn_mp_set_long.obj \

+	$(TMP_DIR)\bn_mp_set_long_long.obj \

 	$(TMP_DIR)\bn_mp_shrink.obj \

 	$(TMP_DIR)\bn_mp_sqr.obj \

 	$(TMP_DIR)\bn_mp_sqrt.obj \

diff --git a/win/tclAppInit.c b/win/tclAppInit.c
index e06eaf5..ef9f98b 100644
--- a/win/tclAppInit.c
+++ b/win/tclAppInit.c
@@ -263,8 +263,8 @@ setargv(
     }
 
     /* Make sure we don't call ckalloc through the (not yet initialized) stub table */
-    #undef Tcl_Alloc
-    #undef Tcl_DbCkalloc
+#   undef Tcl_Alloc
+#   undef Tcl_DbCkalloc
 
     argSpace = ckalloc(size * sizeof(char *)
 	    + (_tcslen(cmdLine) * sizeof(TCHAR)) + sizeof(TCHAR));
diff --git a/win/tclWinPipe.c b/win/tclWinPipe.c
index ff7b97b..633ee63 100644
--- a/win/tclWinPipe.c
+++ b/win/tclWinPipe.c
@@ -3392,11 +3392,11 @@ TclPipeThreadStop(
 	    SetEvent(pipeTI->evWakeUp);
 	}
 	CloseHandle(pipeTI->evControl);
-    #ifndef _PTI_USE_CKALLOC
+#   ifndef _PTI_USE_CKALLOC
 	free(pipeTI);
-    #else
+#   else
 	ckfree(pipeTI);
-    #endif
+#   endif
     }
 }
 
@@ -3440,13 +3440,13 @@ TclPipeThreadExit(
 	if (pipeTI->evWakeUp) {
 	    SetEvent(pipeTI->evWakeUp);
 	}
-    #ifndef _PTI_USE_CKALLOC
+#   ifndef _PTI_USE_CKALLOC
 	free(pipeTI);
-    #else
+#   else
 	ckfree(pipeTI);
 	/* be sure all subsystems used are finalized */
 	Tcl_FinalizeThread();
-    #endif
+#   endif
     }
 }