diff --git a/contrib/tcsh/sh.dol.c b/contrib/tcsh/sh.dol.c index 92c3a6bd6bb4..29e5eb2a8460 100644 --- a/contrib/tcsh/sh.dol.c +++ b/contrib/tcsh/sh.dol.c @@ -1,4 +1,4 @@ -/* $Header: /src/pub/tcsh/sh.dol.c,v 3.39 2000/01/14 22:57:27 christos Exp $ */ +/* $Header: /src/pub/tcsh/sh.dol.c,v 3.40 2000/06/10 21:36:06 kim Exp $ */ /* * sh.dol.c: Variable substitutions */ @@ -36,7 +36,7 @@ */ #include "sh.h" -RCSID("$Id: sh.dol.c,v 3.39 2000/01/14 22:57:27 christos Exp $") +RCSID("$Id: sh.dol.c,v 3.40 2000/06/10 21:36:06 kim Exp $") /* * C shell @@ -225,7 +225,9 @@ Dpack(wbuf, wp) Gcat(STRNULL, wbuf); return (NULL); } +#if defined(DSPMBYTE) mbyteskip: +#endif /* DSPMBYTE */ if (--i <= 0) stderror(ERR_WTOOLONG); *wp++ = (Char) c; diff --git a/contrib/tcsh/sh.time.c b/contrib/tcsh/sh.time.c index f411fb5a1f96..45d0cb808cb8 100644 --- a/contrib/tcsh/sh.time.c +++ b/contrib/tcsh/sh.time.c @@ -1,4 +1,4 @@ -/* $Header: /src/pub/tcsh/sh.time.c,v 3.21 2000/01/14 22:57:29 christos Exp $ */ +/* $Header: /src/pub/tcsh/sh.time.c,v 3.22 2000/06/10 21:35:41 kim Exp $ */ /* * sh.time.c: Shell time keeping and printing. */ @@ -36,7 +36,7 @@ */ #include "sh.h" -RCSID("$Id: sh.time.c,v 3.21 2000/01/14 22:57:29 christos Exp $") +RCSID("$Id: sh.time.c,v 3.22 2000/06/10 21:35:41 kim Exp $") #ifdef SUNOS4 # include @@ -457,7 +457,7 @@ prusage(bs, es, e, b) sysinfo.cpu_count = 1; i = (ms == 0) ? 0 : (t * 1000.0 / (ms * sysinfo.cpu_count)); #else /* convex */ - i = (ms == 0) ? 0 : (t * 1000.0 / ms); + i = (ms == 0) ? 0 : (long)(t * 1000.0 / ms); #endif /* convex */ xprintf("%ld.%01ld%%", i / 10, i % 10); /* nn.n% */ break;