diff options
| author | sebres <sebres@users.sourceforge.net> | 2019-03-05 22:58:30 (GMT) |
|---|---|---|
| committer | sebres <sebres@users.sourceforge.net> | 2019-03-05 22:58:30 (GMT) |
| commit | 27f86643f37b79f4f47a9d764eb7f5918ed5652e (patch) | |
| tree | 992f7d39ea1c9e36654cf1d1c13414aa39b50762 /unix | |
| parent | c843894855cbfa7a3d23ff178954f5bcb43f908c (diff) | |
| parent | 78000f7f87aa86ac0fb04fbb8402c4fc2054d0fa (diff) | |
| download | tcl-27f86643f37b79f4f47a9d764eb7f5918ed5652e.zip tcl-27f86643f37b79f4f47a9d764eb7f5918ed5652e.tar.gz tcl-27f86643f37b79f4f47a9d764eb7f5918ed5652e.tar.bz2 | |
merge 8.6 - timerate is part of Tcl now (since TIP#527 got merged), conflicts resolved, tclDate.c rebuilt with bison, etc.
Diffstat (limited to 'unix')
| -rw-r--r-- | unix/Makefile.in | 8 | ||||
| -rw-r--r-- | unix/tclUnixTime.c | 2 |
2 files changed, 7 insertions, 3 deletions
diff --git a/unix/Makefile.in b/unix/Makefile.in index c5849ef..5ae0c55 100644 --- a/unix/Makefile.in +++ b/unix/Makefile.in @@ -321,8 +321,8 @@ TOMMATH_OBJS = bncore.o bn_reverse.o bn_fast_s_mp_mul_digs.o \ bn_mp_cmp.o bn_mp_cmp_d.o bn_mp_cmp_mag.o \ bn_mp_cnt_lsb.o bn_mp_copy.o \ bn_mp_count_bits.o bn_mp_div.o bn_mp_div_d.o bn_mp_div_2.o \ - bn_mp_div_2d.o bn_mp_div_3.o \ - bn_mp_exch.o bn_mp_expt_d.o bn_mp_grow.o bn_mp_init.o \ + bn_mp_div_2d.o bn_mp_div_3.o bn_mp_exch.o \ + bn_mp_expt_d.o bn_mp_expt_d_ex.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_set_int.o bn_mp_init_size.o bn_mp_karatsuba_mul.o \ bn_mp_karatsuba_sqr.o \ @@ -507,6 +507,7 @@ TOMMATH_SRCS = \ $(TOMMATH_DIR)/bn_mp_div_3.c \ $(TOMMATH_DIR)/bn_mp_exch.c \ $(TOMMATH_DIR)/bn_mp_expt_d.c \ + $(TOMMATH_DIR)/bn_mp_expt_d_ex.c \ $(TOMMATH_DIR)/bn_mp_grow.c \ $(TOMMATH_DIR)/bn_mp_init.c \ $(TOMMATH_DIR)/bn_mp_init_copy.c \ @@ -1431,6 +1432,9 @@ bn_mp_exch.o: $(TOMMATH_DIR)/bn_mp_exch.c $(MATHHDRS) bn_mp_expt_d.o: $(TOMMATH_DIR)/bn_mp_expt_d.c $(MATHHDRS) $(CC) -c $(CC_SWITCHES) $(TOMMATH_DIR)/bn_mp_expt_d.c +bn_mp_expt_d_ex.o: $(TOMMATH_DIR)/bn_mp_expt_d_ex.c $(MATHHDRS) + $(CC) -c $(CC_SWITCHES) $(TOMMATH_DIR)/bn_mp_expt_d_ex.c + bn_mp_grow.o: $(TOMMATH_DIR)/bn_mp_grow.c $(MATHHDRS) $(CC) -c $(CC_SWITCHES) $(TOMMATH_DIR)/bn_mp_grow.c diff --git a/unix/tclUnixTime.c b/unix/tclUnixTime.c index 2a30386..375e366 100644 --- a/unix/tclUnixTime.c +++ b/unix/tclUnixTime.c @@ -248,7 +248,7 @@ TclpWideClicksToNanoseconds( * * TclpWideClickInMicrosec -- * - * This procedure return scale to convert click values from the + * This procedure return scale to convert click values from the * TclpGetWideClicks native resolution to microsecond resolution * and back. * |