From aede9ddb33f7da50c1d7e7b910c6f6bfde660295 Mon Sep 17 00:00:00 2001
From: Keith Bostic <bostic@ucbvax.Berkeley.EDU>
Date: Mon, 6 May 1991 18:08:59 -0800
Subject: [PATCH] cleanup, mostly cosmetic; new copyright; att/bsd/shared

SCCS-vsn: sys/sys/types.h 7.17
---
 usr/src/sys/sys/types.h | 66 +++++++++++++++++++----------------------
 1 file changed, 31 insertions(+), 35 deletions(-)

diff --git a/usr/src/sys/sys/types.h b/usr/src/sys/sys/types.h
index f356b902b1..6df2c23aea 100644
--- a/usr/src/sys/sys/types.h
+++ b/usr/src/sys/sys/types.h
@@ -1,30 +1,45 @@
-/*
- * Copyright (c) 1982 Regents of the University of California.
- * All rights reserved.  The Berkeley software License Agreement
- * specifies the terms and conditions for redistribution.
+/*-
+ * Copyright (c) 1982, 1986, 1991 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * %sccs.include.redist.c%
  *
- *	@(#)types.h	7.16 (Berkeley) %G%
+ *	@(#)types.h	7.17 (Berkeley) %G%
  */
 
 #ifndef _TYPES_H_
 #define	_TYPES_H_
 
-typedef	short	dev_t;
-#ifndef _POSIX_SOURCE
-					/* major part of a device */
-#define	major(x)	((int)(((unsigned)(x) >> 8)&0xff))
-					/* minor part of a device */
-#define	minor(x)	((int)((x)&0xff))
-					/* make a device number */
-#define	makedev(x,y)	((dev_t)(((x)<<8) | (y)))
-#endif
-
 typedef	unsigned char	u_char;
 typedef	unsigned short	u_short;
 typedef	unsigned int	u_int;
 typedef	unsigned long	u_long;
 typedef	unsigned short	ushort;		/* Sys V compatibility */
 
+typedef	char *	caddr_t;		/* core address */
+typedef	long	daddr_t;		/* disk address */
+typedef	short	dev_t;			/* device number */
+typedef	u_long	ino_t;			/* inode number */
+typedef	long	off_t;			/* file offset (should be a quad) */
+typedef	u_short	nlink_t;		/* link count */
+typedef	long	swblk_t;		/* swap offset */
+typedef	long	segsz_t;		/* segment size */
+typedef	u_short	uid_t;			/* user id */
+typedef	u_short	gid_t;			/* group id */
+typedef	short	pid_t;			/* process id */
+typedef	u_short	mode_t;			/* permissions */
+typedef u_long	fixpt_t;		/* fixed point number */
+
+#ifndef _POSIX_SOURCE
+typedef	struct	_uquad	{ u_long val[2]; } u_quad;
+typedef	struct	_quad	{   long val[2]; } quad;
+typedef	long *	qaddr_t;	/* should be typedef quad * qaddr_t; */
+
+#define	major(x)	((int)(((u_int)(x) >> 8)&0xff))	/* major number */
+#define	minor(x)	((int)((x)&0xff))		/* minor number */
+#define	makedev(x,y)	((dev_t)(((x)<<8) | (y)))	/* create dev_t */
+#endif
+
 #include <machine/ansi.h>
 #if !defined(_ANSI_SOURCE) && !defined(_POSIX_SOURCE)
 #include <machine/types.h>
@@ -45,25 +60,6 @@ typedef	_TIME_T_	time_t;
 #undef	_TIME_T_
 #endif
 
-#ifndef _POSIX_SOURCE
-typedef	struct	_uquad { unsigned long val[2]; } u_quad;
-typedef	struct	_quad { long val[2]; } quad;
-#endif
-typedef	long *	qaddr_t;	/* should be typedef quad * qaddr_t; */
-
-typedef	long	daddr_t;
-typedef	char *	caddr_t;
-typedef	u_long	ino_t;
-typedef	long	swblk_t;
-typedef	long	segsz_t;
-typedef	long	off_t;
-typedef	u_short	uid_t;
-typedef	u_short	gid_t;
-typedef	short	pid_t;
-typedef	u_short	nlink_t;
-typedef	u_short	mode_t;
-typedef u_long	fixpt_t;
-
 #ifndef _POSIX_SOURCE
 #define	NBBY	8		/* number of bits in a byte */
 
@@ -71,7 +67,7 @@ typedef u_long	fixpt_t;
  * Select uses bit masks of file descriptors in longs.  These macros
  * manipulate such bit fields (the filesystem macros use chars).
  * FD_SETSIZE may be defined by the user, but the default here should
- * be >= NOFILE (param.h).
+ * be enough for most uses.
  */
 #ifndef	FD_SETSIZE
 #define	FD_SETSIZE	256
-- 
2.20.1