Remove the hack for segsz_t from <sys/types.h>; use the normal

_BSD_FOO_T_ method for defining segsz_t.

6 files changed, 10 insertions, 5 deletions

diff --git a/sys/alpha/include/ansi.h b/sys/alpha/include/ansi.h
index 0526982..3c4b58a 100644
--- a/sys/alpha/include/ansi.h
+++ b/sys/alpha/include/ansi.h
@@ -53,6 +53,7 @@
 #define	_BSD_MBSTATE_T_	__mbstate_t		/* mbstate_t */
 #define	_BSD_PTRDIFF_T_	long			/* ptr1 - ptr2 */
 #define	_BSD_RUNE_T_	_BSD_CT_RUNE_T_		/* rune_t (see below) */
+#define	_BSD_SEGSZ_T_	__int64_t		/* segment size (in pages) */
 #define	_BSD_SIZE_T_	unsigned long		/* sizeof() */
 #define	_BSD_SOCKLEN_T_	__uint32_t		/* socklen_t (duh) */
 #define	_BSD_SSIZE_T_	long			/* byte count or error */
diff --git a/sys/i386/include/ansi.h b/sys/i386/include/ansi.h
index 7af5de2..7f2bf3c 100644
--- a/sys/i386/include/ansi.h
+++ b/sys/i386/include/ansi.h
@@ -52,6 +52,7 @@
 #define	_BSD_MBSTATE_T_	__mbstate_t		/* mbstate_t */
 #define	_BSD_PTRDIFF_T_	int			/* ptr1 - ptr2 */
 #define	_BSD_RUNE_T_	_BSD_CT_RUNE_T_		/* rune_t (see below) */
+#define	_BSD_SEGSZ_T_	__int32_t		/* segment size (in pages) */
 #define	_BSD_SIZE_T_	unsigned int		/* sizeof() */
 #define	_BSD_SOCKLEN_T_	__uint32_t		/* socklen_t (duh) */
 #define	_BSD_SSIZE_T_	int			/* byte count or error */
diff --git a/sys/ia64/include/ansi.h b/sys/ia64/include/ansi.h
index 472bf00..689b568 100644
--- a/sys/ia64/include/ansi.h
+++ b/sys/ia64/include/ansi.h
@@ -53,6 +53,7 @@
 #define	_BSD_MBSTATE_T_	__mbstate_t		/* mbstate_t */
 #define	_BSD_PTRDIFF_T_	long			/* ptr1 - ptr2 */
 #define	_BSD_RUNE_T_	_BSD_CT_RUNE_T_		/* rune_t (see below) */
+#define	_BSD_SEGSZ_T_	__int32_t		/* segment size (in pages) */
 #define	_BSD_SIZE_T_	unsigned long		/* sizeof() */
 #define	_BSD_SOCKLEN_T_	__uint32_t
 #define	_BSD_SSIZE_T_	long			/* byte count or error */
diff --git a/sys/powerpc/include/ansi.h b/sys/powerpc/include/ansi.h
index 838502cc..7decfa5 100644
--- a/sys/powerpc/include/ansi.h
+++ b/sys/powerpc/include/ansi.h
@@ -52,6 +52,7 @@
 #define	_BSD_MBSTATE_T_	__mbstate_t		/* mbstate_t */
 #define	_BSD_PTRDIFF_T_	int			/* ptr1 - ptr2 */
 #define	_BSD_RUNE_T_	_BSD_CT_RUNE_T_		/* rune_t (see below) */
+#define	_BSD_SEGSZ_T_	__int32_t		/* segment size (in pages) */
 #define	_BSD_SIZE_T_	unsigned int		/* sizeof() */
 #define	_BSD_SOCKLEN_T_	__uint32_t		/* socklen_t (duh) */
 #define	_BSD_SSIZE_T_	long			/* byte count or error */
diff --git a/sys/sparc64/include/ansi.h b/sys/sparc64/include/ansi.h
index e99a79d..01a0cd9 100644
--- a/sys/sparc64/include/ansi.h
+++ b/sys/sparc64/include/ansi.h
@@ -53,6 +53,7 @@
 #define	_BSD_MBSTATE_T_	__mbstate_t		/* mbstate_t */
 #define	_BSD_PTRDIFF_T_	long			/* ptr1 - ptr2 */
 #define	_BSD_RUNE_T_	_BSD_CT_RUNE_T_		/* rune_t (see below) */
+#define	_BSD_SEGSZ_T_	__int64_t		/* segment size (in pages) */
 #define	_BSD_SIZE_T_	unsigned long		/* sizeof() */
 #define	_BSD_SOCKLEN_T_	__uint32_t		/* socklen_t (duh) */
 #define	_BSD_SSIZE_T_	long			/* byte count or error */
diff --git a/sys/sys/types.h b/sys/sys/types.h
index cbcf202..17ac8e0 100644
--- a/sys/sys/types.h
+++ b/sys/sys/types.h
@@ -143,12 +143,12 @@ typedef	u_int16_t	nlink_t;	/* link count */
 typedef	_BSD_OFF_T_	off_t;		/* file offset */
 typedef	_BSD_PID_T_	pid_t;		/* process id */
 typedef	quad_t		rlim_t;		/* resource limit */
-#if defined(__alpha__) || defined(__sparc64__)
-/* XXX should be in <machine/types.h> */
-typedef	int64_t		segsz_t;	/* segment size */
-#else
-typedef	int32_t		segsz_t;	/* segment size */
+
+#ifdef _BSD_SEGSZ_T_
+typedef	_BSD_SEGSZ_T_	segsz_t;	/* segment size (in pages) */
+#undef _BSD_SEGSZ_T_
 #endif
+
 typedef	int32_t		swblk_t;	/* swap offset */
 typedef	int32_t		ufs_daddr_t;
 typedef	int32_t		ufs_time_t;