Update to match reality again.

1 files changed, 56 insertions, 31 deletions

diff --git a/share/man/man5/types.5 b/share/man/man5/types.5
index ddef3c3..867e6fa 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$
+.\"	$Id: types.5,v 1.7 1997/02/22 13:26:08 peter Exp $
 .\"
 .Dd June 5, 1993
 .Dt TYPES 5
@@ -49,6 +49,8 @@ used through out the system).
 #ifndef _SYS_TYPES_H_
 #define	_SYS_TYPES_H_
 
+#include <sys/cdefs.h>
+
 /* Machine type dependent parameters. */
 #include <machine/ansi.h>
 #include <machine/types.h>
@@ -69,7 +71,7 @@ typedef	quad_t *	qaddr_t;
 typedef	char *		caddr_t;	/* core address */
 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	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) */
@@ -77,29 +79,16 @@ 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	quad_t		rlim_t;		/* resource limit */
 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
- * casting the second parameter of lseek to off_t will get the correct
- * version of lseek.
- */
-#ifndef KERNEL
-#include <sys/cdefs.h>
-__BEGIN_DECLS
-off_t	 lseek __P((int, off_t, int));
-__END_DECLS
-#endif
-
 #ifndef _POSIX_SOURCE
 /*
  * minor() gives a cookie instead of an index since we don't want to
@@ -118,6 +107,11 @@ typedef	_BSD_CLOCK_T_	clock_t;
 #undef	_BSD_CLOCK_T_
 #endif
 
+#ifdef	_BSD_CLOCKID_T_
+typedef	_BSD_CLOCKID_T_	clockid_t;
+#undef	_BSD_CLOCKID_T_
+#endif
+
 #ifdef	_BSD_SIZE_T_
 typedef	_BSD_SIZE_T_	size_t;
 #undef	_BSD_SIZE_T_
@@ -133,6 +127,26 @@ typedef	_BSD_TIME_T_	time_t;
 #undef	_BSD_TIME_T_
 #endif
 
+#ifdef	_BSD_TIMER_T_
+typedef	_BSD_TIMER_T_	timer_t;
+#undef	_BSD_TIMER_T_
+#endif
+
+#ifdef	_BSD_UINT8_T_
+typedef	_BSD_UINT8_T_	uint8_t;
+#undef	_BSD_UINT8_T_
+#endif
+
+#ifdef	_BSD_UINT16_T_
+typedef	_BSD_UINT16_T_	uint16_t;
+#undef	_BSD_UINT16_T_
+#endif
+
+#ifdef	_BSD_UINT32_T_
+typedef	_BSD_UINT32_T_	uint32_t;
+#undef	_BSD_UINT32_T_
+#endif
+
 #ifndef _POSIX_SOURCE
 #define	NBBY	8		/* number of bits in a byte */
 
@@ -143,11 +157,11 @@ typedef	_BSD_TIME_T_	time_t;
  * be enough for most uses.
  */
 #ifndef	FD_SETSIZE
-#define	FD_SETSIZE	256
+#define	FD_SETSIZE	1024
 #endif
 
-typedef long	fd_mask;
-#define NFDBITS	(sizeof(fd_mask) * NBBY)	/* bits per mask */
+typedef	long	fd_mask;
+#define	NFDBITS	(sizeof(fd_mask) * NBBY)	/* bits per mask */
 
 #ifndef howmany
 #define	howmany(x, y)	(((x) + ((y) - 1)) / (y))
@@ -163,23 +177,34 @@ typedef	struct fd_set {
 #define	FD_COPY(f, t)	bcopy(f, t, sizeof(*(f)))
 #define	FD_ZERO(p)	bzero(p, sizeof(*(p)))
 
-#if defined(__STDC__) && defined(KERNEL)
 /*
- * Forward structure declarations for function prototypes.  We include the
- * common structures that cross subsystem boundaries here; others are mostly
- * used in the same place that the structure is defined.
+ * These declarations belong elsewhere, but are repeated here and in
+ * <stdio.h> to give broken programs a better chance of working with
+ * 64-bit off_t's.
  */
-struct	proc;
-struct	pgrp;
-struct	ucred;
-struct	rusage;
-struct	file;
-struct	buf;
-struct	tty;
-struct	uio;
+#ifndef KERNEL
+__BEGIN_DECLS
+#ifndef _FTRUNCATE_DECLARED
+#define	_FTRUNCATE_DECLARED
+int	 ftruncate __P((int, off_t));
+#endif
+#ifndef _LSEEK_DECLARED
+#define	_LSEEK_DECLARED
+off_t	 lseek __P((int, off_t, int));
+#endif
+#ifndef _MMAP_DECLARED
+#define	_MMAP_DECLARED
+void *	 mmap __P((void *, size_t, int, int, int, off_t));
 #endif
+#ifndef _TRUNCATE_DECLARED
+#define	_TRUNCATE_DECLARED
+int	 truncate __P((const char *, off_t));
+#endif
+__END_DECLS
+#endif /* !KERNEL */
 
 #endif /* !_POSIX_SOURCE */
+
 #endif /* !_SYS_TYPES_H_ */
 .Ed
 .Sh SEE ALSO