diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-10-23 14:33:58 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-10-23 14:33:58 (GMT) |
| commit | d068a5439521392f3c0e90a2d51e7b2769399359 (patch) | |
| tree | 12fa95547b59c55da6140fd5a15945d6a894aebe /unix | |
| parent | 52f3af0bcf937dece6a0a7cc8d6dc254af41f21b (diff) | |
| parent | b986f3138510aaaf704b87f39e2815ad6e3fa5ac (diff) | |
| download | tcl-d068a5439521392f3c0e90a2d51e7b2769399359.zip tcl-d068a5439521392f3c0e90a2d51e7b2769399359.tar.gz tcl-d068a5439521392f3c0e90a2d51e7b2769399359.tar.bz2 | |
Merge 8.7. But - in stead - remove all deprecated API from libtommath 1.2.0: Starting with Tcl 9.0 we don't support libtommath's deprecated API any more.
Diffstat (limited to 'unix')
| -rw-r--r-- | unix/Makefile.in | 5 | ||||
| -rw-r--r-- | unix/tclUnixFile.c | 3 |
2 files changed, 6 insertions, 2 deletions
diff --git a/unix/Makefile.in b/unix/Makefile.in index b21d81e..0e0249e 100644 --- a/unix/Makefile.in +++ b/unix/Makefile.in @@ -329,7 +329,7 @@ TOMMATH_OBJS = bn_s_mp_reverse.o bn_s_mp_mul_digs_fast.o \ bn_mp_div_2d.o bn_mp_div_3.o bn_mp_exch.o bn_mp_expt_u32.o \ bn_s_mp_get_bit.o bn_mp_get_mag_ul.o bn_mp_grow.o bn_mp_init.o \ bn_mp_init_copy.o bn_mp_init_multi.o bn_mp_init_set.o \ - bn_mp_init_size.o bn_s_mp_karatsuba_mul.o \ + bn_mp_init_size.o bn_mp_init_ul.o bn_s_mp_karatsuba_mul.o \ bn_s_mp_karatsuba_sqr.o bn_s_mp_balance_mul.o bn_mp_isodd.o \ bn_mp_lshd.o bn_mp_mod.o bn_mp_mod_2d.o bn_mp_mul.o bn_mp_mul_2.o \ bn_mp_mul_2d.o bn_mp_mul_d.o bn_mp_neg.o bn_mp_or.o \ @@ -1635,6 +1635,9 @@ bn_mp_init_set.o: $(TOMMATH_DIR)/bn_mp_init_set.c $(MATHHDRS) bn_mp_init_size.o:$(TOMMATH_DIR)/bn_mp_init_size.c $(MATHHDRS) $(CC) -c $(CC_SWITCHES) $(TOMMATH_DIR)/bn_mp_init_size.c +bn_mp_init_ul.o:$(TOMMATH_DIR)/bn_mp_init_ul.c $(MATHHDRS) + $(CC) -c $(CC_SWITCHES) $(TOMMATH_DIR)/bn_mp_init_ul.c + bn_s_mp_karatsuba_mul.o: $(TOMMATH_DIR)/bn_s_mp_karatsuba_mul.c $(MATHHDRS) $(CC) -c $(CC_SWITCHES) $(TOMMATH_DIR)/bn_s_mp_karatsuba_mul.c diff --git a/unix/tclUnixFile.c b/unix/tclUnixFile.c index 3589253..0cc4031 100644 --- a/unix/tclUnixFile.c +++ b/unix/tclUnixFile.c @@ -270,7 +270,8 @@ TclpMatchInDirectory( Tcl_Encoding encoding = Tcl_GetEncoding(interp ,NULL); Tcl_DStringInit(&dsOrig); - dirName = TclGetStringFromObj(fileNamePtr, &dirLength); + dirName = TclGetString(fileNamePtr); + dirLength = fileNamePtr->length; Tcl_DStringAppend(&dsOrig, dirName, dirLength); /* |