diff options
| author | Philip Guenther <guenther@cvs.openbsd.org> | 2013-10-24 07:34:57 +0000 |
|---|---|---|
| committer | Philip Guenther <guenther@cvs.openbsd.org> | 2013-10-24 07:34:57 +0000 |
| commit | 7d208da145a1f8a495f8cfb279574b6541ddebf8 (patch) | |
| tree | abbc19792a4806b84a1c56f5c6444f1d467a4369 /sys | |
| parent | c27fdb0652bc97d2fbc2ab9ede852b904193d154 (diff) | |
Align suseconds_t with POSIX: it's the type of the tv_usec member of timeval.
Use useconds_t in the ualarm() declaration.
Bump libstdc++ major to be sure there isn't ABI issues.
ok deraadt@ jca@ jmc@ millert@
ports testing by landry@
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/sys/_types.h | 4 | ||||
| -rw-r--r-- | sys/sys/time.h | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/sys/sys/_types.h b/sys/sys/_types.h index db3a408be13..ba924d9f084 100644 --- a/sys/sys/_types.h +++ b/sys/sys/_types.h @@ -1,4 +1,4 @@ -/* $OpenBSD: _types.h,v 1.7 2013/09/14 01:35:02 guenther Exp $ */ +/* $OpenBSD: _types.h,v 1.8 2013/10/24 07:34:56 guenther Exp $ */ /*- * Copyright (c) 1990, 1993 @@ -57,7 +57,7 @@ typedef __uint64_t __rlim_t; /* resource limit */ typedef __uint8_t __sa_family_t; /* sockaddr address family type */ typedef __int32_t __segsz_t; /* segment size */ typedef __uint32_t __socklen_t; /* length type for network syscalls */ -typedef __int32_t __suseconds_t; /* microseconds (signed) */ +typedef long __suseconds_t; /* microseconds (signed) */ typedef __int32_t __swblk_t; /* swap offset */ typedef __int64_t __time_t; /* epoch time */ typedef __int32_t __timer_t; /* POSIX timer identifiers */ diff --git a/sys/sys/time.h b/sys/sys/time.h index 80861358fcb..10657011c4f 100644 --- a/sys/sys/time.h +++ b/sys/sys/time.h @@ -1,4 +1,4 @@ -/* $OpenBSD: time.h,v 1.33 2013/09/14 01:35:02 guenther Exp $ */ +/* $OpenBSD: time.h,v 1.34 2013/10/24 07:34:56 guenther Exp $ */ /* $NetBSD: time.h,v 1.18 1996/04/23 10:29:33 mycroft Exp $ */ /* @@ -42,8 +42,8 @@ * and used in other calls. */ struct timeval { - time_t tv_sec; /* seconds */ - long tv_usec; /* and microseconds */ + time_t tv_sec; /* seconds */ + suseconds_t tv_usec; /* and microseconds */ }; #ifndef _TIMESPEC_DECLARED |