From aa97685d73e8ea9e497b2c8d1977fc98acbe56c8 Mon Sep 17 00:00:00 2001 From: Davide Italiano Date: Thu, 28 Feb 2013 17:10:30 +0000 Subject: [PATCH] Move the definition of sbintime_t type from to . With this change we prevent gross namespace pollution. Reported by: bde Suggested by: attilio --- sys/sys/time.h | 1 - sys/sys/types.h | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/sys/time.h b/sys/sys/time.h index 927ceccf7c42..555c37ef5cf9 100644 --- a/sys/sys/time.h +++ b/sys/sys/time.h @@ -109,7 +109,6 @@ bintime_mul(struct bintime *bt, u_int x) ((a)->frac cmp (b)->frac) : \ ((a)->sec cmp (b)->sec)) -typedef int64_t sbintime_t; #define SBT_1S ((sbintime_t)1 << 32) #define SBT_1M (SBT_1S * 60) #define SBT_1MS (SBT_1S / 1000) diff --git a/sys/sys/types.h b/sys/sys/types.h index 491e99daefc4..cc0bca8f33bd 100644 --- a/sys/sys/types.h +++ b/sys/sys/types.h @@ -188,6 +188,8 @@ typedef __rlim_t rlim_t; /* resource limit */ #define _RLIM_T_DECLARED #endif +typedef __int64_t sbintime_t; + typedef __segsz_t segsz_t; /* segment size (in pages) */ #ifndef _SIZE_T_DECLARED