1 files changed, 27 insertions, 20 deletions

diff --git a/share/man/man5/types.5 b/share/man/man5/types.5
index 345b840a754c..914268394483 100644
--- a/share/man/man5/types.5
+++ b/share/man/man5/types.5
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)types.5	8.1 (Berkeley) 6/5/93
-.\"	$Id: types.5,v 1.4 1996/12/26 02:02:31 wosch Exp $
+.\"	$Id: types.5,v 1.3.2.1 1996/12/31 22:50:44 mpp Exp $
 .\"
 .Dd June 5, 1993
 .Dt TYPES 5
@@ -49,11 +49,9 @@ used through out the system).
 #ifndef _SYS_TYPES_H_
 #define	_SYS_TYPES_H_
 
-#include <sys/cdefs.h>
-#include <machine/ansi.h>
-
 /* Machine type dependent parameters. */
-#include <machine/endian.h>
+#include <machine/ansi.h>
+#include <machine/types.h>
 
 #ifndef _POSIX_SOURCE
 typedef	unsigned char	u_char;
@@ -64,23 +62,31 @@ typedef	unsigned short	ushort;		/* Sys V compatibility */
 typedef	unsigned int	uint;		/* Sys V compatibility */
 #endif
 
-typedef	unsigned long long u_quad_t;	/* quads */
-typedef	long long	quad_t;
+typedef	u_int64_t	u_quad_t;	/* quads */
+typedef	int64_t		quad_t;
 typedef	quad_t *	qaddr_t;
 
 typedef	char *		caddr_t;	/* core address */
-typedef	long		daddr_t;	/* disk address */
-typedef	unsigned long	dev_t;		/* device number */
-typedef unsigned long	fixpt_t;	/* fixed point number */
-typedef	unsigned long	gid_t;		/* group id */
-typedef	unsigned long	ino_t;		/* inode number */
-typedef	unsigned short	mode_t;		/* permissions */
-typedef	unsigned short	nlink_t;	/* link count */
+typedef	int32_t		daddr_t;	/* disk address */
+typedef	u_int32_t	dev_t;		/* device number */
+typedef u_int32_t	fixpt_t;	/* fixed point number */
+typedef	u_int32_t	gid_t;		/* group id */
+typedef	u_int32_t	ino_t;		/* inode number */
+typedef	long		key_t;		/* IPC key (for Sys V IPC) */
+typedef	u_int16_t	mode_t;		/* permissions */
+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	long		segsz_t;	/* segment size */
-typedef	long		swblk_t;	/* swap offset */
-typedef	unsigned long	uid_t;		/* user id */
+typedef	int32_t		segsz_t;	/* segment size */
+typedef	int32_t		swblk_t;	/* swap offset */
+typedef	u_int32_t	uid_t;		/* user id */
+
+typedef	quad_t		rlim_t; 	/* resource limits */
+
+#ifdef KERNEL
+typedef	int		boolean_t;
+typedef	struct vm_page	*vm_page_t;
+#endif
 
 /*
  * This belongs in unistd.h, but is placed here to ensure that programs
@@ -88,6 +94,7 @@ typedef	unsigned long	uid_t;		/* user id */
  * version of lseek.
  */
 #ifndef KERNEL
+#include <sys/cdefs.h>
 __BEGIN_DECLS
 off_t	 lseek __P((int, off_t, int));
 __END_DECLS
@@ -101,10 +108,10 @@ __END_DECLS
  */
 #define	major(x)	((int)(((u_int)(x) >> 8)&0xff))	/* major number */
 #define	minor(x)	((int)((x)&0xffff00ff))		/* minor number */
-#define	makedev(x,y)	((dev_t)(((x)<<8) | (y)))	/* create dev_t */
+#define	makedev(x,y)	((dev_t)(((x) << 8) | (y)))	/* create dev_t */
 #endif
 
-#include <machine/types.h>
+#include <machine/endian.h>
 
 #ifdef	_BSD_CLOCK_T_
 typedef	_BSD_CLOCK_T_	clock_t;
@@ -143,7 +150,7 @@ typedef long	fd_mask;
 #define NFDBITS	(sizeof(fd_mask) * NBBY)	/* bits per mask */
 
 #ifndef howmany
-#define	howmany(x, y)	(((x)+((y)-1))/(y))
+#define	howmany(x, y)	(((x) + ((y) - 1)) / (y))
 #endif
 
 typedef	struct fd_set {