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@

7 files changed, 14 insertions, 14 deletions

diff --git a/gnu/lib/libstdc++-v3/shlib_version b/gnu/lib/libstdc++-v3/shlib_version
index 96c16009a60..95478c54e77 100644
--- a/gnu/lib/libstdc++-v3/shlib_version
+++ b/gnu/lib/libstdc++-v3/shlib_version
@@ -1,2 +1,2 @@
-major=56
+major=57
 minor=0
diff --git a/gnu/lib/libstdc++/shlib_version b/gnu/lib/libstdc++/shlib_version
index 96c16009a60..95478c54e77 100644
--- a/gnu/lib/libstdc++/shlib_version
+++ b/gnu/lib/libstdc++/shlib_version
@@ -1,2 +1,2 @@
-major=56
+major=57
 minor=0
diff --git a/include/unistd.h b/include/unistd.h
index 1c402512d2a..5a49e70cd93 100644
--- a/include/unistd.h
+++ b/include/unistd.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: unistd.h,v 1.79 2013/06/17 19:11:54 guenther Exp $ */
+/*	$OpenBSD: unistd.h,v 1.80 2013/10/24 07:34:56 guenther Exp $ */
 /*	$NetBSD: unistd.h,v 1.26.4.1 1996/05/28 02:31:51 mrg Exp $	*/
 
 /*-
@@ -428,7 +428,7 @@ int	 setreuid(uid_t, uid_t);
 void	 swab(const void *, void *, size_t);
 void	 sync(void);
 int	 truncate(const char *, off_t);
-unsigned int	 ualarm(unsigned int, unsigned int);
+useconds_t	 ualarm(useconds_t, useconds_t);
 int	 usleep(useconds_t);
 pid_t	 vfork(void);
 #endif
diff --git a/lib/libc/sys/gettimeofday.2 b/lib/libc/sys/gettimeofday.2
index e0b4ad55a52..be24bd5d704 100644
--- a/lib/libc/sys/gettimeofday.2
+++ b/lib/libc/sys/gettimeofday.2
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: gettimeofday.2,v 1.25 2013/09/11 14:38:07 krw Exp $
+.\"	$OpenBSD: gettimeofday.2,v 1.26 2013/10/24 07:34:56 guenther Exp $
 .\"
 .\" Copyright (c) 1980, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -29,7 +29,7 @@
 .\"
 .\"     @(#)gettimeofday.2	8.2 (Berkeley) 5/26/95
 .\"
-.Dd $Mdocdate: September 11 2013 $
+.Dd $Mdocdate: October 24 2013 $
 .Dt GETTIMEOFDAY 2
 .Os
 .Sh NAME
@@ -77,8 +77,8 @@ are defined in
 as:
 .Bd -literal
 struct timeval {
-	time_t	tv_sec;		/* seconds since Jan. 1, 1970 */
-	long	tv_usec;	/* and microseconds */
+	time_t		tv_sec;		/* seconds since Jan. 1, 1970 */
+	suseconds_t	tv_usec;	/* and microseconds */
 };
 
 struct timezone {
diff --git a/regress/misc/c++abi/nm1.ref b/regress/misc/c++abi/nm1.ref
index 63b54dd4fd8..7cac99cb45c 100644
--- a/regress/misc/c++abi/nm1.ref
+++ b/regress/misc/c++abi/nm1.ref
@@ -17,7 +17,7 @@ rlim_t(unsigned long long)
 sa_family_t(unsigned char)
 segsz_t(int)
 socklen_t(unsigned int)
-suseconds_t(int)
+suseconds_t(long)
 swblk_t(int)
 uid_t(unsigned int)
 uint64_t(unsigned long long)
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