add multiple inclusion protection (and cleanup).
This commit is contained in:
perry
parent
45eb2a7d5d
commit
41c3fea850
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: bpfdesc.h,v 1.13 1997/10/09 18:58:12 christos Exp $ */
|
||||
/* $NetBSD: bpfdesc.h,v 1.14 1998/02/09 17:43:44 perry Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1990, 1991, 1993
|
||||
@ -42,9 +42,10 @@
|
||||
* @(#) Header: bpfdesc.h,v 1.14 96/06/16 22:28:07 leres Exp (LBL)
|
||||
*/
|
||||
|
||||
#if BSD >= 199103
|
||||
#ifndef _NET_BPFDESC_H_
|
||||
#define _NET_BPFDESC_H_
|
||||
|
||||
#include <sys/select.h>
|
||||
#endif
|
||||
|
||||
/*
|
||||
* Descriptor associated with each open bpf file.
|
||||
@ -104,3 +105,5 @@ struct bpf_if {
|
||||
#ifdef _KERNEL
|
||||
int bpf_setf __P((struct bpf_d *, struct bpf_program *));
|
||||
#endif
|
||||
|
||||
#endif /* _NET_BPFDESC_H_ */
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: ethertypes.h,v 1.2 1997/03/15 18:12:19 is Exp $ */
|
||||
/* $NetBSD: ethertypes.h,v 1.3 1998/02/09 17:43:45 perry Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1982, 1986, 1993
|
||||
@ -45,8 +45,8 @@
|
||||
* into the hardware independent ARP code. -is
|
||||
*/
|
||||
|
||||
#ifndef _ETHERTYPE_H_
|
||||
#define _ETHERTYPE_H_
|
||||
#ifndef _NET_ETHERTYPES_H_
|
||||
#define _NET_ETHERTYPES_H_
|
||||
|
||||
#define ETHERTYPE_PUP 0x0200 /* PUP protocol */
|
||||
#define ETHERTYPE_IP 0x0800 /* IP protocol */
|
||||
@ -61,4 +61,4 @@
|
||||
#define ETHERTYPE_TRAIL 0x1000 /* Trailer packet */
|
||||
#define ETHERTYPE_NTRAILER 16
|
||||
|
||||
#endif /* _ETHERTYPE_H_ */
|
||||
#endif /* _NET_ETHERTYPES_H_ */
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: if_arc.h,v 1.6 1997/03/15 18:12:30 is Exp $ */
|
||||
/* $NetBSD: if_arc.h,v 1.7 1998/02/09 17:43:45 perry Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1982, 1986, 1993
|
||||
@ -36,6 +36,9 @@
|
||||
* @(#)if_ether.h 8.1 (Berkeley) 6/10/93
|
||||
*/
|
||||
|
||||
#ifndef _NET_IF_ARC_H_
|
||||
#define _NET_IF_ARC_H_
|
||||
|
||||
/*
|
||||
* Arcnet address - 1 octets
|
||||
* don't know who uses this.
|
||||
@ -119,3 +122,5 @@ int arc_output __P((struct ifnet *, struct mbuf *, struct sockaddr *,
|
||||
struct rtentry *));
|
||||
int arc_isphds __P((int));
|
||||
#endif
|
||||
|
||||
#endif /* _NET_IF_ARC_H_ */
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: if_arp.h,v 1.12 1997/09/08 02:06:30 mikel Exp $ */
|
||||
/* $NetBSD: if_arp.h,v 1.13 1998/02/09 17:43:46 perry Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1986, 1993
|
||||
@ -35,8 +35,8 @@
|
||||
* @(#)if_arp.h 8.1 (Berkeley) 6/10/93
|
||||
*/
|
||||
|
||||
#ifndef _IF_ARP_H_
|
||||
#define _IF_ARP_H_
|
||||
#ifndef _NET_IF_ARP_H_
|
||||
#define _NET_IF_ARP_H_
|
||||
/*
|
||||
* Address Resolution Protocol.
|
||||
*
|
||||
@ -96,4 +96,4 @@ struct arpreq {
|
||||
#define ATF_PUBL 0x08 /* publish entry (respond for other host) */
|
||||
#define ATF_USETRAILERS 0x10 /* has requested trailers */
|
||||
|
||||
#endif /* _IF_ARP_H_ */
|
||||
#endif /* _NET_IF_ARP_H_ */
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: if_atm.h,v 1.7 1996/11/09 23:02:27 chuck Exp $ */
|
||||
/* $NetBSD: if_atm.h,v 1.8 1998/02/09 17:43:47 perry Exp $ */
|
||||
|
||||
/*
|
||||
*
|
||||
@ -36,6 +36,9 @@
|
||||
* net/if_atm.h
|
||||
*/
|
||||
|
||||
#ifndef _NET_IF_ATM_H_
|
||||
#define _NET_IF_ATM_H_
|
||||
|
||||
#if (defined(__FreeBSD__) || defined(__bsdi__)) && defined(KERNEL)
|
||||
#ifndef _KERNEL
|
||||
#define _KERNEL
|
||||
@ -109,3 +112,5 @@ void atm_input __P((struct ifnet *, struct atm_pseudohdr *,
|
||||
int atm_output __P((struct ifnet *, struct mbuf *, struct sockaddr *,
|
||||
struct rtentry *));
|
||||
#endif
|
||||
|
||||
#endif /* _NET_IF_ATM_H_ */
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: if_dl.h,v 1.8 1995/03/26 20:30:13 jtc Exp $ */
|
||||
/* $NetBSD: if_dl.h,v 1.9 1998/02/09 17:43:48 perry Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1990, 1993
|
||||
@ -53,6 +53,9 @@
|
||||
* expected that all drivers for an interface of a given if_type will agree.
|
||||
*/
|
||||
|
||||
#ifndef _NET_IF_DL_H_
|
||||
#define _NET_IF_DL_H_
|
||||
|
||||
/*
|
||||
* Structure of a Link-Level sockaddr:
|
||||
*/
|
||||
@ -80,3 +83,5 @@ char *link_ntoa __P((const struct sockaddr_dl *));
|
||||
__END_DECLS
|
||||
|
||||
#endif /* !_KERNEL */
|
||||
|
||||
#endif /* _NET_IF_DL_H_ */
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: if_ether.h,v 1.3 1997/11/02 14:26:15 lukem Exp $ */
|
||||
/* $NetBSD: if_ether.h,v 1.4 1998/02/09 17:43:49 perry Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1982, 1986, 1993
|
||||
@ -35,6 +35,9 @@
|
||||
* @(#)if_ether.h 8.1 (Berkeley) 6/10/93
|
||||
*/
|
||||
|
||||
#ifndef _NET_IF_ETHER_H_
|
||||
#define _NET_IF_ETHER_H_
|
||||
|
||||
/*
|
||||
* Ethernet address - 6 octets
|
||||
* this is only used by the ethers(3) functions.
|
||||
@ -180,3 +183,5 @@ int ether_hostton __P((const char *, struct ether_addr *));
|
||||
int ether_line __P((const char *, struct ether_addr *, char *));
|
||||
__END_DECLS
|
||||
#endif
|
||||
|
||||
#endif /* _NET_IF_ETHER_H_ */
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: if_fddi.h,v 1.4 1997/03/24 00:35:02 thorpej Exp $ */
|
||||
/* $NetBSD: if_fddi.h,v 1.5 1998/02/09 17:43:50 perry Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1995 Matt Thomas (thomas@lkg.dec.com)
|
||||
@ -26,8 +26,8 @@
|
||||
* Id: if_fddi.h,v 1.5 1997/03/21 13:46:50 thomas Exp
|
||||
*/
|
||||
|
||||
#ifndef _NETINET_IF_FDDI_H_
|
||||
#define _NETINET_IF_FDDI_H_
|
||||
#ifndef _NET_IF_FDDI_H_
|
||||
#define _NET_IF_FDDI_H_
|
||||
|
||||
/*
|
||||
* Structure of an 100Mb/s FDDI header.
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: if_llc.h,v 1.9 1997/05/02 21:08:54 christos Exp $ */
|
||||
/* $NetBSD: if_llc.h,v 1.10 1998/02/09 17:43:50 perry Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1988, 1993
|
||||
@ -35,6 +35,9 @@
|
||||
* @(#)if_llc.h 8.1 (Berkeley) 6/10/93
|
||||
*/
|
||||
|
||||
#ifndef _NET_IF_LLC_H_
|
||||
#define _NET_IF_LLC_H_
|
||||
|
||||
/*
|
||||
* IEEE 802.2 Link Level Control headers, for use in conjunction with
|
||||
* 802.{3,4,5} media access control methods.
|
||||
@ -150,3 +153,5 @@ struct frmrinfo {
|
||||
#define LLC_X25_LSAP 0x7e
|
||||
#define LLC_SNAP_LSAP 0xaa
|
||||
#define LLC_ISO_LSAP 0xfe
|
||||
|
||||
#endif /* _NET_IF_LLC_H_ */
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: if_ppp.h,v 1.14 1997/05/17 21:12:02 christos Exp $ */
|
||||
/* $NetBSD: if_ppp.h,v 1.15 1998/02/09 17:43:51 perry Exp $ */
|
||||
/* Id: if_ppp.h,v 1.16 1997/04/30 05:46:04 paulus Exp */
|
||||
|
||||
/*
|
||||
@ -20,8 +20,8 @@
|
||||
* WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
|
||||
*/
|
||||
|
||||
#ifndef _IF_PPP_H_
|
||||
#define _IF_PPP_H_
|
||||
#ifndef _NET_IF_PPP_H_
|
||||
#define _NET_IF_PPP_H_
|
||||
|
||||
/*
|
||||
* Bit definitions for flags.
|
||||
@ -130,4 +130,4 @@ struct ifpppcstatsreq {
|
||||
void pppattach __P((void));
|
||||
void pppintr __P((void));
|
||||
#endif
|
||||
#endif /* _IF_PPP_H_ */
|
||||
#endif /* _NET_IF_PPP_H_ */
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: if_pppvar.h,v 1.7 1997/05/17 21:12:03 christos Exp $ */
|
||||
/* $NetBSD: if_pppvar.h,v 1.8 1998/02/09 17:43:52 perry Exp $ */
|
||||
/* Id: if_pppvar.h,v 1.3 1996/07/01 01:04:37 paulus Exp */
|
||||
|
||||
/*
|
||||
@ -43,6 +43,9 @@
|
||||
* WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
|
||||
*/
|
||||
|
||||
#ifndef _NET_IF_PPPVAR_H_
|
||||
#define _NET_IF_PPPVAR_H_
|
||||
|
||||
/*
|
||||
* Supported network protocols. These values are used for
|
||||
* indexing sc_npmode.
|
||||
@ -113,3 +116,5 @@ struct mbuf *ppp_dequeue __P((struct ppp_softc *sc));
|
||||
int pppoutput __P((struct ifnet *, struct mbuf *,
|
||||
struct sockaddr *, struct rtentry *));
|
||||
#endif /* _KERNEL */
|
||||
|
||||
#endif /* _NET_IF_PPPVAR_H_ */
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: if_slvar.h,v 1.17 1997/03/27 20:36:17 thorpej Exp $ */
|
||||
/* $NetBSD: if_slvar.h,v 1.18 1998/02/09 17:43:52 perry Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1991, 1993
|
||||
@ -35,6 +35,9 @@
|
||||
* @(#)if_slvar.h 8.3 (Berkeley) 2/1/94
|
||||
*/
|
||||
|
||||
#ifndef _NET_IF_SLVAR_H_
|
||||
#define _NET_IF_SLVAR_H_
|
||||
|
||||
/*
|
||||
* Definitions for SLIP interface data structures
|
||||
*
|
||||
@ -86,3 +89,5 @@ int sloutput __P((struct ifnet *,
|
||||
void slstart __P((struct tty *));
|
||||
int sltioctl __P((struct tty *, u_long, caddr_t, int));
|
||||
#endif /* _KERNEL */
|
||||
|
||||
#endif /* _NET_IF_SLVAR_H_ */
|
||||
|
||||
@ -1,10 +1,11 @@
|
||||
/* $NetBSD: if_stripvar.h,v 1.5 1997/11/17 23:35:32 thorpej Exp $ */
|
||||
/* $NetBSD: if_stripvar.h,v 1.6 1998/02/09 17:43:53 perry Exp $ */
|
||||
|
||||
#ifndef _NET_IF_STRIPVAR_H_
|
||||
#define _NET_IF_STRIPVAR_H_
|
||||
|
||||
/*
|
||||
* Definitions for SLIP interface data structures
|
||||
* Definitions for STRIP interface data structures
|
||||
*
|
||||
* (This exists so programs like slstats can get at the definition
|
||||
* of sl_softc.)
|
||||
*/
|
||||
struct strip_softc {
|
||||
struct ifnet sc_if; /* network-visible interface */
|
||||
@ -60,3 +61,5 @@ int stripoutput __P((struct ifnet *,
|
||||
void stripstart __P((struct tty *));
|
||||
int striptioctl __P((struct tty *, u_long, caddr_t, int));
|
||||
#endif /* _KERNEL */
|
||||
|
||||
#endif /* _NET_IF_STRIPVAR_H_ */
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: if_types.h,v 1.9 1998/02/04 01:00:23 ross Exp $ */
|
||||
/* $NetBSD: if_types.h,v 1.10 1998/02/09 17:43:54 perry Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1989, 1993, 1994
|
||||
@ -35,6 +35,9 @@
|
||||
* @(#)if_types.h 8.2 (Berkeley) 4/20/94
|
||||
*/
|
||||
|
||||
#ifndef _NET_IF_TYPES_H_
|
||||
#define _NET_IF_TYPES_H_
|
||||
|
||||
/*
|
||||
* Interface types for benefit of parsing media address headers.
|
||||
* This list is derived from the SNMP list of ifTypes, currently
|
||||
@ -170,3 +173,5 @@
|
||||
#define IFT_DOCSCABLEMACLAYER 0x7f /* CATV Mac Layer */
|
||||
#define IFT_DOCSCABLEDOWNSTREAM 0x80 /* CATV Downstream interface */
|
||||
#define IFT_DOCSCABLEUPSTREAM 0x81 /* CATV Upstream interface */
|
||||
|
||||
#endif /* _NET_IF_TYPES_H_ */
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: netisr.h,v 1.15 1997/04/02 21:23:29 christos Exp $ */
|
||||
/* $NetBSD: netisr.h,v 1.16 1998/02/09 17:43:54 perry Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1980, 1986, 1989, 1993
|
||||
@ -35,6 +35,9 @@
|
||||
* @(#)netisr.h 8.1 (Berkeley) 6/10/93
|
||||
*/
|
||||
|
||||
#ifndef _NET_NETISR_H_
|
||||
#define _NET_NETISR_H_
|
||||
|
||||
/*
|
||||
* The networking code runs off software interrupts.
|
||||
*
|
||||
@ -71,3 +74,5 @@
|
||||
int netisr; /* scheduling bits for network */
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#endif /* _NET_NETISR_H_ */
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: ppp_defs.h,v 1.3 1997/05/17 21:12:08 christos Exp $ */
|
||||
/* $NetBSD: ppp_defs.h,v 1.4 1998/02/09 17:43:55 perry Exp $ */
|
||||
/* Id: ppp_defs.h,v 1.11 1997/04/30 05:46:24 paulus Exp */
|
||||
|
||||
/*
|
||||
@ -28,8 +28,8 @@
|
||||
* OR MODIFICATIONS.
|
||||
*/
|
||||
|
||||
#ifndef _PPP_DEFS_H_
|
||||
#define _PPP_DEFS_H_
|
||||
#ifndef _NET_PPP_DEFS_H_
|
||||
#define _NET_PPP_DEFS_H_
|
||||
|
||||
/*
|
||||
* The basic PPP frame.
|
||||
@ -175,4 +175,4 @@ struct ppp_idle {
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#endif /* _PPP_DEFS_H_ */
|
||||
#endif /* _NET_PPP_DEFS_H_ */
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: raw_cb.h,v 1.11 1996/05/28 23:24:50 pk Exp $ */
|
||||
/* $NetBSD: raw_cb.h,v 1.12 1998/02/09 17:43:56 perry Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1980, 1986, 1993
|
||||
@ -35,6 +35,9 @@
|
||||
* @(#)raw_cb.h 8.1 (Berkeley) 6/10/93
|
||||
*/
|
||||
|
||||
#ifndef _NET_RAW_CB_H_
|
||||
#define _NET_RAW_CB_H_
|
||||
|
||||
/*
|
||||
* Raw protocol interface control block. Used
|
||||
* to tie a socket to the generic raw interface.
|
||||
@ -70,3 +73,5 @@ void raw_setsockaddr __P((struct rawcb *, struct mbuf *));
|
||||
void raw_setpeeraddr __P((struct rawcb *, struct mbuf *));
|
||||
|
||||
#endif /* _KERNEL */
|
||||
|
||||
#endif /* _NET_RAW_CB_H_ */
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: slcompress.h,v 1.11 1997/05/17 21:12:11 christos Exp $ */
|
||||
/* $NetBSD: slcompress.h,v 1.12 1998/02/09 17:43:56 perry Exp $ */
|
||||
/* Id: slcompress.h,v 1.4 1994/09/21 06:50:08 paulus Exp */
|
||||
|
||||
/*
|
||||
@ -43,8 +43,8 @@
|
||||
* - Initial distribution.
|
||||
*/
|
||||
|
||||
#ifndef _SLCOMPRESS_H_
|
||||
#define _SLCOMPRESS_H_
|
||||
#ifndef _NET_SLCOMPRESS_H_
|
||||
#define _NET_SLCOMPRESS_H_
|
||||
|
||||
#define MAX_STATES 16 /* must be > 2 and < 256 */
|
||||
#define MAX_HDR MLEN /* XXX 4bsd-ism: should really be 128 */
|
||||
@ -166,4 +166,4 @@ int sl_uncompress_tcp __P((u_char **, int, u_int, struct slcompress *));
|
||||
int sl_uncompress_tcp_core __P((u_char *, int, int, u_int,
|
||||
struct slcompress *, u_char **, u_int *));
|
||||
|
||||
#endif /* _SLCOMPRESS_H_ */
|
||||
#endif /* _NET_SLCOMPRESS_H_ */
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: slip.h,v 1.6 1994/06/29 06:36:53 cgd Exp $ */
|
||||
/* $NetBSD: slip.h,v 1.7 1998/02/09 17:43:57 perry Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1994
|
||||
@ -35,6 +35,9 @@
|
||||
* @(#)slip.h 8.1 (Berkeley) 2/12/94
|
||||
*/
|
||||
|
||||
#ifndef _NET_SLIP_H_
|
||||
#define _NET_SLIP_H_
|
||||
|
||||
/* Ioctls operating on SLIP ttys. */
|
||||
#define SLIOCGUNIT _IOR('t', 88, int) /* get slip unit number */
|
||||
|
||||
@ -51,3 +54,5 @@
|
||||
|
||||
#define SLIPDIR_IN 0 /* incoming */
|
||||
#define SLIPDIR_OUT 1 /* outgoing */
|
||||
|
||||
#endif /* _NET_SLIP_H_ */
|
||||
|
||||
Loading…
Reference in New Issue
Block a user