Make size_t, ssize_t, intptr_t and uintptr_t consistent amongst our

architectures.  They are now defined as unsigned long, long, long
and unsigned long respectively.

9 files changed, 33 insertions, 39 deletions

diff --git a/sys/arch/arm/include/_types.h b/sys/arch/arm/include/_types.h
index af6569f722e..0985b1dd2b9 100644
--- a/sys/arch/arm/include/_types.h
+++ b/sys/arch/arm/include/_types.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: _types.h,v 1.1 2006/01/06 18:50:08 millert Exp $	*/
+/*	$OpenBSD: _types.h,v 1.2 2006/01/13 17:50:05 millert Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -94,9 +94,9 @@ typedef unsigned long		__psize_t;
 typedef int			__clock_t;
 typedef int			__clockid_t;
 typedef long long		__off_t;
-typedef int			__ptrdiff_t;
-typedef	unsigned int		__size_t;
-typedef	int			__ssize_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
diff --git a/sys/arch/hppa/include/_types.h b/sys/arch/hppa/include/_types.h
index c61534632fc..c3b6c07eef0 100644
--- a/sys/arch/hppa/include/_types.h
+++ b/sys/arch/hppa/include/_types.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: _types.h,v 1.1 2006/01/06 18:50:08 millert Exp $	*/
+/*	$OpenBSD: _types.h,v 1.2 2006/01/13 17:50:06 millert Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -102,9 +102,9 @@ typedef unsigned long		__psize_t;
 typedef int			__clock_t;
 typedef int			__clockid_t;
 typedef long long		__off_t;
-typedef int			__ptrdiff_t;
-typedef	unsigned int		__size_t;
-typedef	int			__ssize_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
diff --git a/sys/arch/i386/include/_types.h b/sys/arch/i386/include/_types.h
index ccad5063d2d..8d54ca43d8c 100644
--- a/sys/arch/i386/include/_types.h
+++ b/sys/arch/i386/include/_types.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: _types.h,v 1.1 2006/01/06 18:50:08 millert Exp $	*/
+/*	$OpenBSD: _types.h,v 1.2 2006/01/13 17:50:06 millert Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -94,9 +94,9 @@ typedef unsigned long		__psize_t;
 typedef int			__clock_t;
 typedef int			__clockid_t;
 typedef long long		__off_t;
-typedef int			__ptrdiff_t;
-typedef	unsigned int		__size_t;
-typedef	int			__ssize_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
diff --git a/sys/arch/m68k/include/_types.h b/sys/arch/m68k/include/_types.h
index 61a27d07600..8c31455080b 100644
--- a/sys/arch/m68k/include/_types.h
+++ b/sys/arch/m68k/include/_types.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: _types.h,v 1.1 2006/01/06 18:50:09 millert Exp $	*/
+/*	$OpenBSD: _types.h,v 1.2 2006/01/13 17:50:06 millert Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -94,9 +94,9 @@ typedef unsigned long		__psize_t;
 typedef int			__clock_t;
 typedef int			__clockid_t;
 typedef long long		__off_t;
-typedef int			__ptrdiff_t;
-typedef	unsigned int		__size_t;
-typedef	int			__ssize_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
diff --git a/sys/arch/m88k/include/_types.h b/sys/arch/m88k/include/_types.h
index feb6deb6123..7a9867ec926 100644
--- a/sys/arch/m88k/include/_types.h
+++ b/sys/arch/m88k/include/_types.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: _types.h,v 1.1 2006/01/06 18:50:09 millert Exp $	*/
+/*	$OpenBSD: _types.h,v 1.2 2006/01/13 17:50:06 millert Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -94,9 +94,9 @@ typedef unsigned long		__psize_t;
 typedef int			__clock_t;
 typedef int			__clockid_t;
 typedef long long		__off_t;
-typedef int			__ptrdiff_t;
-typedef	unsigned int		__size_t;
-typedef	int			__ssize_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
diff --git a/sys/arch/mips64/include/_types.h b/sys/arch/mips64/include/_types.h
index e700741de2a..3d9ca5f2aab 100644
--- a/sys/arch/mips64/include/_types.h
+++ b/sys/arch/mips64/include/_types.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: _types.h,v 1.1 2006/01/06 18:50:09 millert Exp $	*/
+/*	$OpenBSD: _types.h,v 1.2 2006/01/13 17:50:06 millert Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -102,15 +102,9 @@ typedef unsigned long		__psize_t;
 typedef int			__clock_t;
 typedef int			__clockid_t;
 typedef long long		__off_t;
-#if defined(__LP64__)
 typedef long			__ptrdiff_t;
 typedef	unsigned long		__size_t;
 typedef	long			__ssize_t;
-#else
-typedef int			__ptrdiff_t;
-typedef	unsigned int		__size_t;
-typedef	int			__ssize_t;
-#endif
 typedef	int			__time_t;
 typedef int			__timer_t;
 #if defined(__GNUC__) && __GNUC__ >= 3
diff --git a/sys/arch/powerpc/include/_types.h b/sys/arch/powerpc/include/_types.h
index 9100ead53e3..1529aa9cdfb 100644
--- a/sys/arch/powerpc/include/_types.h
+++ b/sys/arch/powerpc/include/_types.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: _types.h,v 1.1 2006/01/06 18:50:09 millert Exp $	*/
+/*	$OpenBSD: _types.h,v 1.2 2006/01/13 17:50:06 millert Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -94,9 +94,9 @@ typedef unsigned long		__psize_t;
 typedef int			__clock_t;
 typedef int			__clockid_t;
 typedef long long		__off_t;
-typedef int			__ptrdiff_t;
-typedef	unsigned int		__size_t;
-typedef	int			__ssize_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
diff --git a/sys/arch/sparc/include/_types.h b/sys/arch/sparc/include/_types.h
index ff62e682147..b097c421517 100644
--- a/sys/arch/sparc/include/_types.h
+++ b/sys/arch/sparc/include/_types.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: _types.h,v 1.1 2006/01/06 18:50:09 millert Exp $	*/
+/*	$OpenBSD: _types.h,v 1.2 2006/01/13 17:50:06 millert Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -94,9 +94,9 @@ typedef unsigned long		__psize_t;
 typedef int			__clock_t;
 typedef int			__clockid_t;
 typedef long long		__off_t;
-typedef int			__ptrdiff_t;
-typedef	unsigned int		__size_t;
-typedef	int			__ssize_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
diff --git a/sys/arch/vax/include/_types.h b/sys/arch/vax/include/_types.h
index f344ca7e818..f36d8f2fd63 100644
--- a/sys/arch/vax/include/_types.h
+++ b/sys/arch/vax/include/_types.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: _types.h,v 1.1 2006/01/06 18:50:10 millert Exp $	*/
+/*	$OpenBSD: _types.h,v 1.2 2006/01/13 17:50:06 millert Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -94,9 +94,9 @@ typedef unsigned long		__psize_t;
 typedef int			__clock_t;
 typedef int			__clockid_t;
 typedef long long		__off_t;
-typedef int			__ptrdiff_t;
-typedef	unsigned int		__size_t;
-typedef	int			__ssize_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