Don't export anything from <sys/socket.h> except AF_MAX from here.

This only affects the KERNEL case.

Don't include <sys/radix.h> twice for the KERNEL case.  This fixes
a mismerge from Lite2.

Don't include <sys/radix.h> at all for the !KERNEL case.  This fixes
a wrong cleanup in Lite2.
This commit is contained in:
Bruce Evans 1998-03-28 12:13:01 +00:00
parent 771b51ef7b
commit 8c375f5868
1 changed files with 3 additions and 4 deletions

View File

@ -31,7 +31,7 @@
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* @(#)mount.h 8.21 (Berkeley) 5/20/95 * @(#)mount.h 8.21 (Berkeley) 5/20/95
* $Id: mount.h,v 1.58 1998/03/08 09:58:29 julian Exp $ * $Id: mount.h,v 1.59 1998/03/28 10:33:22 bde Exp $
*/ */
#ifndef _SYS_MOUNT_H_ #ifndef _SYS_MOUNT_H_
@ -40,8 +40,6 @@
#include <sys/ucred.h> #include <sys/ucred.h>
#include <sys/queue.h> #include <sys/queue.h>
#include <sys/lock.h> #include <sys/lock.h>
#include <net/radix.h>
#include <sys/socket.h> /* XXX for AF_MAX */
typedef struct fsid { int32_t val[2]; } fsid_t; /* file system id type */ typedef struct fsid { int32_t val[2]; } fsid_t; /* file system id type */
@ -414,7 +412,8 @@ struct vfsops {
#ifdef KERNEL #ifdef KERNEL
#include <net/radix.h> #include <net/radix.h>
#include <sys/socket.h> /* XXX for AF_MAX */
#define AF_MAX 30 /* XXX */
/* /*
* Network address lookup element * Network address lookup element