diff options
author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-11-11 14:26:50 (GMT) |
---|---|---|
committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-11-11 14:26:50 (GMT) |
commit | e512564f360551e1821bc646ce75314246b9a0ee (patch) | |
tree | 855d2542e38d1f5c55cb823745749f8ec7f3148c /win | |
parent | 99cce0ea110b9e0d8eec550f8bcc125b75940031 (diff) | |
parent | ac7ef03d8e108d7c755c1f560808429d0f4a0ce2 (diff) | |
download | tcl-e512564f360551e1821bc646ce75314246b9a0ee.zip tcl-e512564f360551e1821bc646ce75314246b9a0ee.tar.gz tcl-e512564f360551e1821bc646ce75314246b9a0ee.tar.bz2 |
Merge 8.7
Diffstat (limited to 'win')
-rw-r--r-- | win/Makefile.in | 5 | ||||
-rw-r--r-- | win/makefile.vc | 5 | ||||
-rw-r--r-- | win/tclWinFile.c | 7 | ||||
-rw-r--r-- | win/tclWinPort.h | 1 |
4 files changed, 15 insertions, 3 deletions
diff --git a/win/Makefile.in b/win/Makefile.in index 5d0fcbf..3a179b4 100644 --- a/win/Makefile.in +++ b/win/Makefile.in @@ -384,9 +384,12 @@ TOMMATH_OBJS = \ 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} \ @@ -402,6 +405,8 @@ TOMMATH_OBJS = \ 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} \ diff --git a/win/makefile.vc b/win/makefile.vc index 2d98f3d..cd7e6ba 100644 --- a/win/makefile.vc +++ b/win/makefile.vc @@ -341,9 +341,12 @@ 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_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 \
@@ -359,6 +362,8 @@ 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_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 \
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 697f779..306e943 100644 --- a/win/tclWinPort.h +++ b/win/tclWinPort.h @@ -478,6 +478,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) |