summaryrefslogtreecommitdiffstats
path: root/sys
diff options
context:
space:
mode:
authoreivind <eivind@FreeBSD.org>1998-04-23 14:12:06 +0000
committereivind <eivind@FreeBSD.org>1998-04-23 14:12:06 +0000
commit2297a9666d59394f5c7b5ce52e853caa14ddd86c (patch)
tree6a61e685e7de8a12e56a11c4e908e6308ad2f7e9 /sys
parentb99377bfd2ac83603b373e2b892e0859afbf6dcd (diff)
downloadFreeBSD-src-2297a9666d59394f5c7b5ce52e853caa14ddd86c.zip
FreeBSD-src-2297a9666d59394f5c7b5ce52e853caa14ddd86c.tar.gz
Convert timespecclear() back to an expression (this time without
sideeffects).
Diffstat (limited to 'sys')
-rw-r--r--sys/sys/time.h9
-rw-r--r--sys/sys/timetc.h9
2 files changed, 6 insertions, 12 deletions
diff --git a/sys/sys/time.h b/sys/sys/time.h
index 38b0ffc..44750b7 100644
--- a/sys/sys/time.h
+++ b/sys/sys/time.h
@@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)time.h 8.5 (Berkeley) 5/4/95
- * $Id: time.h,v 1.24 1998/04/06 08:26:08 phk Exp $
+ * $Id: time.h,v 1.25 1998/04/23 00:11:32 eivind Exp $
*/
#ifndef _SYS_TIME_H_
@@ -158,7 +158,7 @@ struct timecounter {
#ifdef KERNEL
/* Operations on timespecs */
-#define timespecclear(tvp) (tvp)->tv_sec = (tvp)->tv_nsec = 0
+#define timespecclear(tvp) ((tvp)->tv_sec = (tvp)->tv_nsec = 0)
#define timespecisset(tvp) ((tvp)->tv_sec || (tvp)->tv_nsec)
#define timespeccmp(tvp, uvp, cmp) \
(((tvp)->tv_sec == (uvp)->tv_sec) ? \
@@ -198,10 +198,7 @@ struct timecounter {
#ifndef KERNEL /* NetBSD/OpenBSD compatable interfaces */
-#define timerclear(tvp) \
- do { \
- (tvp)->tv_sec = (tvp)->tv_usec = 0; \
- } while(0)
+#define timerclear(tvp) (tvp)->tv_sec = (tvp)->tv_usec = 0
#define timerisset(tvp) ((tvp)->tv_sec || (tvp)->tv_usec)
#define timercmp(tvp, uvp, cmp) \
(((tvp)->tv_sec == (uvp)->tv_sec) ? \
diff --git a/sys/sys/timetc.h b/sys/sys/timetc.h
index 38b0ffc..44750b7 100644
--- a/sys/sys/timetc.h
+++ b/sys/sys/timetc.h
@@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)time.h 8.5 (Berkeley) 5/4/95
- * $Id: time.h,v 1.24 1998/04/06 08:26:08 phk Exp $
+ * $Id: time.h,v 1.25 1998/04/23 00:11:32 eivind Exp $
*/
#ifndef _SYS_TIME_H_
@@ -158,7 +158,7 @@ struct timecounter {
#ifdef KERNEL
/* Operations on timespecs */
-#define timespecclear(tvp) (tvp)->tv_sec = (tvp)->tv_nsec = 0
+#define timespecclear(tvp) ((tvp)->tv_sec = (tvp)->tv_nsec = 0)
#define timespecisset(tvp) ((tvp)->tv_sec || (tvp)->tv_nsec)
#define timespeccmp(tvp, uvp, cmp) \
(((tvp)->tv_sec == (uvp)->tv_sec) ? \
@@ -198,10 +198,7 @@ struct timecounter {
#ifndef KERNEL /* NetBSD/OpenBSD compatable interfaces */
-#define timerclear(tvp) \
- do { \
- (tvp)->tv_sec = (tvp)->tv_usec = 0; \
- } while(0)
+#define timerclear(tvp) (tvp)->tv_sec = (tvp)->tv_usec = 0
#define timerisset(tvp) ((tvp)->tv_sec || (tvp)->tv_usec)
#define timercmp(tvp, uvp, cmp) \
(((tvp)->tv_sec == (uvp)->tv_sec) ? \
OpenPOWER on IntegriCloud