backout previous; off_t must be signed and there might be other C++ API

breakage lurking; ok kettenis@

16 files changed, 99 insertions, 29 deletions

diff --git a/sys/arch/alpha/include/_types.h b/sys/arch/alpha/include/_types.h
index e154cb334c9..d50d8fde325 100644
--- a/sys/arch/alpha/include/_types.h
+++ b/sys/arch/alpha/include/_types.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: _types.h,v 1.18 2013/07/04 05:19:40 guenther Exp $	*/
+/*	$OpenBSD: _types.h,v 1.19 2013/07/04 13:57:39 otto Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -117,11 +117,16 @@ typedef unsigned long		__vsize_t;
 typedef unsigned long		__psize_t;
 
 /* Standard system types */
+typedef int			__clock_t;
+typedef int			__clockid_t;
 typedef double			__double_t;
 typedef float			__float_t;
+typedef long long		__off_t;
 typedef long			__ptrdiff_t;
 typedef	unsigned long		__size_t;
 typedef	long			__ssize_t;
+typedef	int			__time_t;
+typedef int			__timer_t;
 #if defined(__GNUC__) && __GNUC__ >= 3
 typedef	__builtin_va_list	__va_list;
 #else
diff --git a/sys/arch/amd64/include/_types.h b/sys/arch/amd64/include/_types.h
index d42375c117e..94186de9614 100644
--- a/sys/arch/amd64/include/_types.h
+++ b/sys/arch/amd64/include/_types.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: _types.h,v 1.11 2013/07/04 05:19:41 guenther Exp $	*/
+/*	$OpenBSD: _types.h,v 1.12 2013/07/04 13:57:40 otto Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -117,11 +117,16 @@ typedef unsigned long		__vsize_t;
 typedef unsigned long		__psize_t;
 
 /* Standard system types */
+typedef int			__clock_t;
+typedef int			__clockid_t;
 typedef	double			__double_t;
 typedef	float			__float_t;
+typedef long long		__off_t;
 typedef long			__ptrdiff_t;
 typedef	unsigned long		__size_t;
 typedef	long			__ssize_t;
+typedef	int			__time_t;
+typedef int			__timer_t;
 #if defined(__GNUC__) && __GNUC__ >= 3
 typedef	__builtin_va_list	__va_list;
 #else
diff --git a/sys/arch/arm/include/_types.h b/sys/arch/arm/include/_types.h
index 4e87981040b..255a744101c 100644
--- a/sys/arch/arm/include/_types.h
+++ b/sys/arch/arm/include/_types.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: _types.h,v 1.11 2013/07/04 05:19:41 guenther Exp $	*/
+/*	$OpenBSD: _types.h,v 1.12 2013/07/04 13:57:40 otto Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -117,11 +117,16 @@ typedef unsigned long		__vsize_t;
 typedef unsigned long		__psize_t;
 
 /* Standard system types */
+typedef int			__clock_t;
+typedef int			__clockid_t;
 typedef double			__double_t;
 typedef float			__float_t;
+typedef long long		__off_t;
 typedef long			__ptrdiff_t;
 typedef	unsigned long		__size_t;
 typedef	long			__ssize_t;
+typedef	int			__time_t;
+typedef int			__timer_t;
 #if defined(__GNUC__) && __GNUC__ >= 3
 typedef	__builtin_va_list	__va_list;
 #else
diff --git a/sys/arch/hppa/include/_types.h b/sys/arch/hppa/include/_types.h
index c6c4b7963ae..33b1e49c063 100644
--- a/sys/arch/hppa/include/_types.h
+++ b/sys/arch/hppa/include/_types.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: _types.h,v 1.19 2013/07/04 05:19:41 guenther Exp $	*/
+/*	$OpenBSD: _types.h,v 1.20 2013/07/04 13:57:40 otto Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -121,11 +121,16 @@ typedef unsigned long		__vsize_t;
 typedef unsigned long		__psize_t;
 
 /* Standard system types */
+typedef int			__clock_t;
+typedef int			__clockid_t;
 typedef double			__double_t;
 typedef float			__float_t;
+typedef long long		__off_t;
 typedef long			__ptrdiff_t;
 typedef	unsigned long		__size_t;
 typedef	long			__ssize_t;
+typedef	int			__time_t;
+typedef int			__timer_t;
 #if defined(__GNUC__) && __GNUC__ >= 3
 typedef	__builtin_va_list	__va_list;
 #else
diff --git a/sys/arch/hppa64/include/_types.h b/sys/arch/hppa64/include/_types.h
index ab4f9edbdea..69ad6d7337e 100644
--- a/sys/arch/hppa64/include/_types.h
+++ b/sys/arch/hppa64/include/_types.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: _types.h,v 1.12 2013/07/04 05:19:41 guenther Exp $	*/
+/*	$OpenBSD: _types.h,v 1.13 2013/07/04 13:57:40 otto Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -121,11 +121,16 @@ typedef unsigned long		__vsize_t;
 typedef unsigned long		__psize_t;
 
 /* Standard system types */
+typedef int			__clock_t;
+typedef int			__clockid_t;
 typedef double			__double_t;
 typedef float			__float_t;
+typedef long long		__off_t;
 typedef long			__ptrdiff_t;
 typedef	unsigned long		__size_t;
 typedef	long			__ssize_t;
+typedef	int			__time_t;
+typedef int			__timer_t;
 typedef	__builtin_va_list	__va_list;
 
 /* Wide character support types */
diff --git a/sys/arch/i386/include/_types.h b/sys/arch/i386/include/_types.h
index c12502cc2e8..ea4a8546b0f 100644
--- a/sys/arch/i386/include/_types.h
+++ b/sys/arch/i386/include/_types.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: _types.h,v 1.16 2013/07/04 05:19:41 guenther Exp $	*/
+/*	$OpenBSD: _types.h,v 1.17 2013/07/04 13:57:41 otto Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -117,11 +117,16 @@ typedef unsigned long		__vsize_t;
 typedef unsigned long		__psize_t;
 
 /* Standard system types */
+typedef int			__clock_t;
+typedef int			__clockid_t;
 typedef long double		__double_t;
 typedef long double		__float_t;
+typedef long long		__off_t;
 typedef long			__ptrdiff_t;
 typedef	unsigned long		__size_t;
 typedef	long			__ssize_t;
+typedef	int			__time_t;
+typedef int			__timer_t;
 #if defined(__GNUC__) && __GNUC__ >= 3
 typedef	__builtin_va_list	__va_list;
 #else
diff --git a/sys/arch/ia64/include/_types.h b/sys/arch/ia64/include/_types.h
index 1cf6a2ebf79..a8a145380e6 100644
--- a/sys/arch/ia64/include/_types.h
+++ b/sys/arch/ia64/include/_types.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: _types.h,v 1.5 2013/07/04 05:19:42 guenther Exp $	*/
+/*	$OpenBSD: _types.h,v 1.6 2013/07/04 13:57:41 otto Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -118,11 +118,16 @@ typedef unsigned long		__vsize_t;
 typedef unsigned long		__psize_t;
 
 /* Standard system types */
+typedef int			__clock_t;
+typedef int			__clockid_t;
 typedef	double			__double_t;
 typedef	float			__float_t;
+typedef long long		__off_t;
 typedef long			__ptrdiff_t;
 typedef	unsigned long		__size_t;
 typedef	long			__ssize_t;
+typedef	int			__time_t;
+typedef int			__timer_t;
 #if defined(__GNUC__) && __GNUC__ >= 3
 typedef	__builtin_va_list	__va_list;
 #else
diff --git a/sys/arch/m68k/include/_types.h b/sys/arch/m68k/include/_types.h
index e51f5e3ed9a..d89e0eaee42 100644
--- a/sys/arch/m68k/include/_types.h
+++ b/sys/arch/m68k/include/_types.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: _types.h,v 1.13 2013/07/04 05:19:42 guenther Exp $	*/
+/*	$OpenBSD: _types.h,v 1.14 2013/07/04 13:57:41 otto Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -117,11 +117,16 @@ typedef unsigned long		__vsize_t;
 typedef unsigned long		__psize_t;
 
 /* Standard system types */
+typedef int			__clock_t;
+typedef int			__clockid_t;
 typedef long double		__double_t;
 typedef long double		__float_t;
+typedef long long		__off_t;
 typedef long			__ptrdiff_t;
 typedef	unsigned long		__size_t;
 typedef	long			__ssize_t;
+typedef	int			__time_t;
+typedef int			__timer_t;
 #if defined(__GNUC__) && __GNUC__ >= 3
 typedef	__builtin_va_list	__va_list;
 #else
diff --git a/sys/arch/m88k/include/_types.h b/sys/arch/m88k/include/_types.h
index be8f515656c..aad3d5223b7 100644
--- a/sys/arch/m88k/include/_types.h
+++ b/sys/arch/m88k/include/_types.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: _types.h,v 1.11 2013/07/04 05:19:42 guenther Exp $	*/
+/*	$OpenBSD: _types.h,v 1.12 2013/07/04 13:57:41 otto Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -121,11 +121,16 @@ typedef unsigned long		__vsize_t;
 typedef unsigned long		__psize_t;
 
 /* Standard system types */
+typedef int			__clock_t;
+typedef int			__clockid_t;
 typedef long double		__double_t;
 typedef long double		__float_t;
+typedef long long		__off_t;
 typedef long			__ptrdiff_t;
 typedef	unsigned long		__size_t;
 typedef	long			__ssize_t;
+typedef	int			__time_t;
+typedef int			__timer_t;
 #if defined(__GNUC__) && __GNUC__ >= 3
 typedef	__builtin_va_list	__va_list;
 #else
diff --git a/sys/arch/mips64/include/_types.h b/sys/arch/mips64/include/_types.h
index e8a3db1caa6..81f7a471db1 100644
--- a/sys/arch/mips64/include/_types.h
+++ b/sys/arch/mips64/include/_types.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: _types.h,v 1.13 2013/07/04 05:19:42 guenther Exp $	*/
+/*	$OpenBSD: _types.h,v 1.14 2013/07/04 13:57:42 otto Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -125,11 +125,16 @@ typedef unsigned long		__vsize_t;
 typedef unsigned long		__psize_t;
 
 /* Standard system types */
+typedef int			__clock_t;
+typedef int			__clockid_t;
 typedef double			__double_t;
 typedef float			__float_t;
+typedef long long		__off_t;
 typedef long			__ptrdiff_t;
 typedef	unsigned long		__size_t;
 typedef	long			__ssize_t;
+typedef	int			__time_t;
+typedef int			__timer_t;
 #if defined(__GNUC__) && __GNUC__ >= 3
 typedef	__builtin_va_list	__va_list;
 #else
diff --git a/sys/arch/powerpc/include/_types.h b/sys/arch/powerpc/include/_types.h
index f2e3088fc6b..a30fe665a2e 100644
--- a/sys/arch/powerpc/include/_types.h
+++ b/sys/arch/powerpc/include/_types.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: _types.h,v 1.15 2013/07/04 05:19:43 guenther Exp $	*/
+/*	$OpenBSD: _types.h,v 1.16 2013/07/04 13:57:42 otto Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -117,11 +117,16 @@ typedef unsigned long		__vsize_t;
 typedef unsigned long		__psize_t;
 
 /* Standard system types */
+typedef int			__clock_t;
+typedef int			__clockid_t;
 typedef double			__double_t;
 typedef float			__float_t;
+typedef long long		__off_t;
 typedef long			__ptrdiff_t;
 typedef	unsigned long		__size_t;
 typedef	long			__ssize_t;
+typedef	int			__time_t;
+typedef int			__timer_t;
 #if defined(__GNUC__) && __GNUC__ >= 3
 typedef	__builtin_va_list	__va_list;
 #else
diff --git a/sys/arch/sh/include/_types.h b/sys/arch/sh/include/_types.h
index 50340688842..c8b27cdf62f 100644
--- a/sys/arch/sh/include/_types.h
+++ b/sys/arch/sh/include/_types.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: _types.h,v 1.13 2013/07/04 05:19:43 guenther Exp $	*/
+/*	$OpenBSD: _types.h,v 1.14 2013/07/04 13:57:42 otto Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -117,11 +117,16 @@ typedef unsigned long		__vsize_t;
 typedef unsigned long		__psize_t;
 
 /* Standard system types */
+typedef int			__clock_t;
+typedef int			__clockid_t;
 typedef double			__double_t;
 typedef float			__float_t;
+typedef long long		__off_t;
 typedef long			__ptrdiff_t;
 typedef	unsigned long		__size_t;
 typedef	long			__ssize_t;
+typedef	int			__time_t;
+typedef int			__timer_t;
 #if defined(__GNUC__) && __GNUC__ >= 3
 typedef	__builtin_va_list	__va_list;
 #else
diff --git a/sys/arch/sparc/include/_types.h b/sys/arch/sparc/include/_types.h
index 6534611d307..ef66a80ef71 100644
--- a/sys/arch/sparc/include/_types.h
+++ b/sys/arch/sparc/include/_types.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: _types.h,v 1.20 2013/07/04 05:19:43 guenther Exp $	*/
+/*	$OpenBSD: _types.h,v 1.21 2013/07/04 13:57:42 otto Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -118,11 +118,16 @@ typedef unsigned long		__vsize_t;
 typedef unsigned long		__psize_t;
 
 /* Standard system types */
+typedef int			__clock_t;
+typedef int			__clockid_t;
 typedef double			__double_t;
 typedef float			__float_t;
+typedef long long		__off_t;
 typedef long			__ptrdiff_t;
 typedef	unsigned long		__size_t;
 typedef	long			__ssize_t;
+typedef	int			__time_t;
+typedef int			__timer_t;
 #if defined(__GNUC__) && __GNUC__ >= 3
 typedef	__builtin_va_list	__va_list;
 #else
diff --git a/sys/arch/sparc64/include/_types.h b/sys/arch/sparc64/include/_types.h
index 9203c2ca47c..4ae2b5cc8d5 100644
--- a/sys/arch/sparc64/include/_types.h
+++ b/sys/arch/sparc64/include/_types.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: _types.h,v 1.16 2013/07/04 05:19:43 guenther Exp $	*/
+/*	$OpenBSD: _types.h,v 1.17 2013/07/04 13:57:43 otto Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -117,11 +117,16 @@ typedef unsigned long		__vsize_t;
 typedef unsigned long		__psize_t;
 
 /* Standard system types */
+typedef int			__clock_t;
+typedef int			__clockid_t;
 typedef	double			__double_t;
 typedef	float			__float_t;
+typedef long long		__off_t;
 typedef long			__ptrdiff_t;
 typedef	unsigned long		__size_t;
 typedef	long			__ssize_t;
+typedef	int			__time_t;
+typedef int			__timer_t;
 #if defined(__GNUC__) && __GNUC__ >= 3
 typedef	__builtin_va_list	__va_list;
 #else
diff --git a/sys/arch/vax/include/_types.h b/sys/arch/vax/include/_types.h
index 39f5a3af8d5..d3f39991f2a 100644
--- a/sys/arch/vax/include/_types.h
+++ b/sys/arch/vax/include/_types.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: _types.h,v 1.16 2013/07/04 05:19:44 guenther Exp $	*/
+/*	$OpenBSD: _types.h,v 1.17 2013/07/04 13:57:43 otto Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -117,11 +117,16 @@ typedef unsigned long		__vsize_t;
 typedef unsigned long		__psize_t;
 
 /* Standard system types */
+typedef int			__clock_t;
+typedef int			__clockid_t;
 typedef	double			__double_t;
 typedef	float			__float_t;
+typedef long long		__off_t;
 typedef long			__ptrdiff_t;
 typedef	unsigned long		__size_t;
 typedef	long			__ssize_t;
+typedef	int			__time_t;
+typedef int			__timer_t;
 #if defined(__GNUC__) && __GNUC__ >= 3
 typedef	__builtin_va_list	__va_list;
 #else
diff --git a/sys/sys/_types.h b/sys/sys/_types.h
index d4bd97eaf5a..3a7d7f8439f 100644
--- a/sys/sys/_types.h
+++ b/sys/sys/_types.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: _types.h,v 1.3 2013/07/04 05:19:40 guenther Exp $	*/
+/*	$OpenBSD: _types.h,v 1.4 2013/07/04 13:57:39 otto Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -36,33 +36,28 @@
 
 #include <machine/_types.h>
 
-typedef	__int32_t	__clock_t;	/* ticks in CLOCKS_PER_SEC */
-typedef	__int32_t	__clockid_t;	/* CLOCK_* identifiers */
 typedef	unsigned long	__cpuid_t;	/* CPU id */
 typedef	__int32_t	__dev_t;	/* device number */
 typedef	__uint32_t	__fixpt_t;	/* fixed point number */
-typedef	__uint64_t	__fsblkcnt_t;	/* file system block count */
-typedef	__uint64_t	__fsfilcnt_t;	/* file system file count */
 typedef	__uint32_t	__gid_t;	/* group id */
 typedef	__uint32_t	__id_t;		/* may contain pid, uid or gid */
-typedef	__uint32_t	__in_addr_t;	/* base type for internet address */
-typedef	__uint16_t	__in_port_t;	/* IP port type */
+typedef __uint32_t	__in_addr_t;	/* base type for internet address */
+typedef __uint16_t	__in_port_t;	/* IP port type */
 typedef	__uint32_t	__ino_t;	/* inode number */
 typedef	long		__key_t;	/* IPC key (for Sys V IPC) */
 typedef	__uint32_t	__mode_t;	/* permissions */
 typedef	__uint32_t	__nlink_t;	/* link count */
-typedef	__uint64_t	__off_t;	/* file offset or size */
 typedef	__int32_t	__pid_t;	/* process id */
-typedef	__uint64_t	__rlim_t;	/* resource limit */
-typedef	__uint8_t	__sa_family_t;	/* sockaddr address family type */
+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 __uint32_t	__socklen_t;	/* length type for network syscalls */
 typedef	__int32_t	__swblk_t;	/* swap offset */
-typedef	__int32_t	__time_t;	/* epoch time */
-typedef	__int32_t	__timer_t;	/* POSIX timer identifiers */
 typedef	__uint32_t	__uid_t;	/* user id */
 typedef	__uint32_t	__useconds_t;	/* microseconds */
+typedef	__int32_t	__suseconds_t;	/* microseconds (signed) */
+typedef __uint64_t	__fsblkcnt_t;	/* file system block count */
+typedef __uint64_t	__fsfilcnt_t;	/* file system file count */
 
 /*
  * mbstate_t is an opaque object to keep conversion state, during multibyte