diff options
Diffstat (limited to 'include/mach/time_value.h')
| -rw-r--r-- | include/mach/time_value.h | 52 |
1 files changed, 26 insertions, 26 deletions
diff --git a/include/mach/time_value.h b/include/mach/time_value.h index 0c89f4eb..8274197d 100644 --- a/include/mach/time_value.h +++ b/include/mach/time_value.h @@ -94,7 +94,7 @@ static __inline__ time_value_t convert_time_value_from_user(rpc_time_value_t tv) assert(0 <= (val)->nanoseconds && (val)->nanoseconds < TIME_NANOS_MAX); #define time_value_add_usec(val, micros) \ -MACRO_BEGIN \ +do { \ time_value_assert(val); \ if (((val)->microseconds += (micros)) \ >= TIME_MICROS_MAX) { \ @@ -102,10 +102,10 @@ MACRO_BEGIN \ (val)->seconds++; \ } \ time_value_assert(val); \ -MACRO_END +} while(0) #define time_value64_add_nanos(val, nanos) \ -MACRO_BEGIN \ +do { \ time_value64_assert(val); \ if (((val)->nanoseconds += (nanos)) \ >= TIME_NANOS_MAX) { \ @@ -113,56 +113,56 @@ MACRO_BEGIN \ (val)->seconds++; \ } \ time_value64_assert(val); \ -MACRO_END +} while(0) #define time_value64_sub_nanos(val, nanos) \ -MACRO_BEGIN \ +do { \ time_value64_assert(val); \ if (((val)->nanoseconds -= (nanos)) < 0) { \ (val)->nanoseconds += TIME_NANOS_MAX; \ (val)->seconds--; \ } \ time_value64_assert(val); \ -MACRO_END +} while(0) #define time_value_add(result, addend) \ -MACRO_BEGIN \ +do { \ time_value_assert(addend); \ (result)->seconds += (addend)->seconds; \ time_value_add_usec(result, (addend)->microseconds); \ -MACRO_END +} while(0) #define time_value64_add(result, addend) \ -MACRO_BEGIN \ +do { \ time_value64_assert(addend); \ (result)->seconds += (addend)->seconds; \ time_value64_add_nanos(result, (addend)->nanoseconds); \ -MACRO_END +} while(0) #define time_value64_sub(result, subtrahend) \ -MACRO_BEGIN \ +do { \ time_value64_assert(subtrahend); \ (result)->seconds -= (subtrahend)->seconds; \ time_value64_sub_nanos(result, (subtrahend)->nanoseconds); \ -MACRO_END +} while(0) #define time_value64_init(tv) \ -MACRO_BEGIN \ +do { \ (tv)->seconds = 0; \ (tv)->nanoseconds = 0; \ -MACRO_END +} while(0) #define TIME_VALUE64_TO_TIME_VALUE(tv64, tv) \ -MACRO_BEGIN \ +do { \ (tv)->seconds = (tv64)->seconds; \ (tv)->microseconds = (tv64)->nanoseconds / 1000; \ -MACRO_END +} while(0) #define TIME_VALUE_TO_TIME_VALUE64(tv, tv64) \ -MACRO_BEGIN \ +do { \ (tv64)->seconds = (tv)->seconds; \ (tv64)->nanoseconds = (tv)->microseconds * 1000; \ -MACRO_END +} while(0) /* * Time value available through the mapped-time interface. @@ -188,29 +188,29 @@ typedef struct mapped_time_value { /* Macros for converting between struct timespec and time_value_t. */ #define TIME_VALUE_TO_TIMESPEC(tv, ts) \ -MACRO_BEGIN \ +do { \ (ts)->tv_sec = (tv)->seconds; \ (ts)->tv_nsec = (tv)->microseconds * 1000; \ -MACRO_END +} while(0) #define TIMESPEC_TO_TIME_VALUE(tv, ts) \ -MACRO_BEGIN \ +do { \ (tv)->seconds = (ts)->tv_sec; \ (tv)->microseconds = (ts)->tv_nsec / 1000; \ -MACRO_END +} while(0) /* Macros for converting between struct timespec and time_value64_t. */ #define TIME_VALUE64_TO_TIMESPEC(tv, ts) \ -MACRO_BEGIN \ +do { \ (ts)->tv_sec = (tv)->seconds; \ (ts)->tv_nsec = (tv)->nanoseconds; \ -MACRO_END +} while(0) #define TIMESPEC_TO_TIME_VALUE64(tv, ts) \ -MACRO_BEGIN \ +do { \ (tv)->seconds = (ts)->tv_sec; \ (tv)->nanoseconds = (ts)->tv_nsec; \ -MACRO_END +} while(0) #endif /* _MACH_TIME_VALUE_H_ */ |