aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbuytenh <buytenh>2001-06-22 20:01:56 +0000
committerbuytenh <buytenh>2001-06-22 20:01:56 +0000
commitfc88c325a473093e525c985d6d1d8f0c35e0c268 (patch)
tree75bb76b63ede6208221d8b2c1183c0b872684f87
parent38837a8e19540690c80f5a3b0971e0e1495a4a3e (diff)
downloadbridge-utils-fc88c325a473093e525c985d6d1d8f0c35e0c268.tar.gz
Fix 42.94 second wrap buglet.
-rw-r--r--libbridge/libbridge_misc.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/libbridge/libbridge_misc.c b/libbridge/libbridge_misc.c
index 75b957f..31e054e 100644
--- a/libbridge/libbridge_misc.c
+++ b/libbridge/libbridge_misc.c
@@ -26,18 +26,18 @@
unsigned long __tv_to_jiffies(struct timeval *tv)
{
- unsigned long jif;
+ unsigned long long jif;
- jif = 1000000 * tv->tv_sec + tv->tv_usec;
+ jif = 1000000ULL * tv->tv_sec + tv->tv_usec;
return (HZ*jif)/1000000;
}
void __jiffies_to_tv(struct timeval *tv, unsigned long jiffies)
{
- unsigned long tvusec;
+ unsigned long long tvusec;
- tvusec = (1000000*jiffies)/HZ;
+ tvusec = (1000000ULL*jiffies)/HZ;
tv->tv_sec = tvusec/1000000;
tv->tv_usec = tvusec - 1000000 * tv->tv_sec;
}