Sun Jan 4 04:22:10 2009 UTC ()

tv_usec is suseconds_t.


(christos)

diff -r1.61.2.3 -r1.61.2.4 src/sys/sys/time.h

--- src/sys/sys/time.h 2008/12/28 18:38:55	1.61.2.3
+++ src/sys/sys/time.h 2009/01/04 04:22:10	1.61.2.4

 @@ -1,14 +1,14 @@
-/*	$NetBSD: time.h,v 1.61.2.3 2008/12/28 18:38:55 christos Exp $	*/
+/*	$NetBSD: time.h,v 1.61.2.4 2009/01/04 04:22:10 christos Exp $	*/
 /*
  * Copyright (c) 1982, 1986, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -173,27 +173,27 @@ timespec2bintime(const struct timespec *
+{
 	bt->sec = ts->tv_sec;
 	/* 18446744073 = int(2^64 / 1000000000) */
 	bt->frac = ts->tv_nsec * (uint64_t)18446744073LL;
+}
 static __inline void
 bintime2timeval(const struct bintime *bt, struct timeval *tv)
+{
 	tv->tv_sec = bt->sec;
 	tv->tv_usec =
-	    (long)(((uint64_t)1000000 * (uint32_t)(bt->frac >> 32)) >> 32);
+	    (suseconds_t)(((uint64_t)1000000 * (uint32_t)(bt->frac >> 32)) >> 32);
+}
 static __inline void
 timeval2bintime(const struct timeval *tv, struct bintime *bt)
+{
 	bt->sec = tv->tv_sec;
 	/* 18446744073709 = int(2^64 / 1000000) */
 	bt->frac = tv->tv_usec * (uint64_t)18446744073709LL;
+}
 #endif /* !defined(_STANDALONE) */
 /* Operations on timespecs. */