[src/trunk]: src/sys/netiso Multiple inclusion protection, as suggested by ch...

To: source-changes-hg%NetBSD.org@localhost
Subject: [src/trunk]: src/sys/netiso Multiple inclusion protection, as suggested by ch...
From: elad <elad%NetBSD.org@localhost>
Date: Fri, 24 Jan 2020 17:58:33 +0000
details:   https://anonhg.NetBSD.org/src/rev/840956ad4f0c
branches:  trunk
changeset: 586236:840956ad4f0c
user:      elad <elad%NetBSD.org@localhost>
date:      Sun Dec 11 00:01:36 2005 +0000

description:
Multiple inclusion protection, as suggested by christos@ on tech-kern@
few days ago.

diffstat:

 sys/netiso/argo_debug.h |  4 ++--
 sys/netiso/clnl.h       |  8 +++++++-
 sys/netiso/clnp.h       |  8 ++++----
 sys/netiso/clnp_stat.h  |  4 ++--
 sys/netiso/cltp_var.h   |  7 ++++++-
 sys/netiso/cons.h       |  9 ++++++++-
 sys/netiso/cons_pcb.h   |  7 ++++++-
 sys/netiso/eonvar.h     |  7 ++++++-
 sys/netiso/esis.h       |  7 ++++++-
 sys/netiso/idrp_var.h   |  7 ++++++-
 sys/netiso/iso.h        |  4 ++--
 sys/netiso/iso_errno.h  |  4 ++--
 sys/netiso/iso_pcb.h    |  7 ++++++-
 sys/netiso/iso_snpac.h  |  7 ++++++-
 sys/netiso/iso_var.h    |  4 ++--
 sys/netiso/tp_clnp.h    |  4 ++--
 sys/netiso/tp_events.h  |  7 ++++++-
 sys/netiso/tp_ip.h      |  4 ++--
 sys/netiso/tp_meas.h    |  8 +++++++-
 sys/netiso/tp_param.h   |  4 ++--
 sys/netiso/tp_pcb.h     |  4 ++--
 sys/netiso/tp_seq.h     |  4 ++--
 sys/netiso/tp_stat.h    |  4 ++--
 sys/netiso/tp_states.h  |  7 ++++++-
 sys/netiso/tp_timer.h   |  4 ++--
 sys/netiso/tp_tpdu.h    |  4 ++--
 sys/netiso/tp_trace.h   |  4 ++--
 sys/netiso/tp_user.h    |  8 ++++----
 sys/netiso/tp_var.h     |  7 ++++++-
 29 files changed, 118 insertions(+), 49 deletions(-)

diffs (truncated from 581 to 300 lines):

diff -r b57ae1c80aa0 -r 840956ad4f0c sys/netiso/argo_debug.h
--- a/sys/netiso/argo_debug.h   Sat Dec 10 23:44:08 2005 +0000
+++ b/sys/netiso/argo_debug.h   Sun Dec 11 00:01:36 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: argo_debug.h,v 1.14 2005/05/29 21:27:45 christos Exp $ */
+/*     $NetBSD: argo_debug.h,v 1.15 2005/12/11 00:01:36 elad Exp $     */
 
 /*-
  * Copyright (c) 1991, 1993
@@ -251,4 +251,4 @@
 
 #endif                         /* ARGO_DEBUG */
 
-#endif                         /* _NETISO_ARGO_DEBUG_H_ */
+#endif /* !_NETISO_ARGO_DEBUG_H_ */
diff -r b57ae1c80aa0 -r 840956ad4f0c sys/netiso/clnl.h
--- a/sys/netiso/clnl.h Sat Dec 10 23:44:08 2005 +0000
+++ b/sys/netiso/clnl.h Sun Dec 11 00:01:36 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: clnl.h,v 1.8 2004/04/20 02:13:26 matt Exp $    */
+/*     $NetBSD: clnl.h,v 1.9 2005/12/11 00:01:36 elad Exp $    */
 
 /*-
  * Copyright (c) 1991, 1993
@@ -57,7 +57,13 @@
 /*
  * ARGO Project, Computer Sciences Dept., University of Wisconsin - Madison
  */
+
+#ifndef _NETISO_CLNL_H_
+#define _NETISO_CLNL_H_
+
 struct clnl_protosw {
        /* input routine */
        void            (*clnl_input) (struct mbuf *, ...);
 };
+
+#endif /* !_NETISO_CLNL_H_ */
diff -r b57ae1c80aa0 -r 840956ad4f0c sys/netiso/clnp.h
--- a/sys/netiso/clnp.h Sat Dec 10 23:44:08 2005 +0000
+++ b/sys/netiso/clnp.h Sun Dec 11 00:01:36 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: clnp.h,v 1.19 2005/05/29 21:27:45 christos Exp $       */
+/*     $NetBSD: clnp.h,v 1.20 2005/12/11 00:01:36 elad Exp $   */
 
 /*-
  * Copyright (c) 1991, 1993, 1994
@@ -54,8 +54,8 @@
 
 ******************************************************************/
 
-#ifndef _NETISO_CLNP_H
-#define _NETISO_CLNP_H
+#ifndef _NETISO_CLNP_H_
+#define _NETISO_CLNP_H_
 
 /*
  * ARGO Project, Computer Sciences Dept., University of Wisconsin - Madison
@@ -545,4 +545,4 @@
 
 #endif /* _KERNEL */
 
-#endif /* !_NETISO_CLNP_H */
+#endif /* !_NETISO_CLNP_H_ */
diff -r b57ae1c80aa0 -r 840956ad4f0c sys/netiso/clnp_stat.h
--- a/sys/netiso/clnp_stat.h    Sat Dec 10 23:44:08 2005 +0000
+++ b/sys/netiso/clnp_stat.h    Sun Dec 11 00:01:36 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: clnp_stat.h,v 1.8 2003/08/07 16:33:33 agc Exp $        */
+/*     $NetBSD: clnp_stat.h,v 1.9 2005/12/11 00:01:36 elad Exp $       */
 
 /*-
  * Copyright (c) 1991, 1993
@@ -102,4 +102,4 @@
 #define INCSTAT(x) clnp_stat.x++
 #endif /* _KERNEL */
 
-#endif                         /* _NETISO_CLNP_STAT_H_ */
+#endif /* !_NETISO_CLNP_STAT_H_ */
diff -r b57ae1c80aa0 -r 840956ad4f0c sys/netiso/cltp_var.h
--- a/sys/netiso/cltp_var.h     Sat Dec 10 23:44:08 2005 +0000
+++ b/sys/netiso/cltp_var.h     Sun Dec 11 00:01:36 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cltp_var.h,v 1.13 2004/04/20 02:13:26 matt Exp $       */
+/*     $NetBSD: cltp_var.h,v 1.14 2005/12/11 00:01:36 elad Exp $       */
 
 /*
  * Copyright (c) 1989, 1993
@@ -31,6 +31,9 @@
  *     @(#)cltp_var.h  8.1 (Berkeley) 6/10/93
  */
 
+#ifndef _NETISO_CLTP_VAR_H_
+#define _NETISO_CLTP_VAR_H_
+
 #define UD_TPDU_type   0x40    /* packet type */
 
 #define CLTPOVAL_SRC   0xc1    /* Source TSAP -- required */
@@ -59,3 +62,5 @@
 int cltp_usrreq (struct socket *, int, struct mbuf *, struct mbuf *,
                     struct mbuf *, struct proc *);
 #endif
+
+#endif /* !_NETISO_CLTP_VAR_H_ */
diff -r b57ae1c80aa0 -r 840956ad4f0c sys/netiso/cons.h
--- a/sys/netiso/cons.h Sat Dec 10 23:44:08 2005 +0000
+++ b/sys/netiso/cons.h Sun Dec 11 00:01:36 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cons.h,v 1.9 2003/08/07 16:33:34 agc Exp $     */
+/*     $NetBSD: cons.h,v 1.10 2005/12/11 00:01:36 elad Exp $   */
 
 /*-
  * Copyright (c) 1991, 1993
@@ -57,10 +57,15 @@
 /*
  * ARGO Project, Computer Sciences Dept., University of Wisconsin - Madison
  */
+
+#ifndef _NETISO_CONS_H_
+#define _NETISO_CONS_H_
+
 /*
  * interface between TP and CONS
  */
 
+
 #define        CONSOPT_X25CRUD 0x01    /* set x.25 call request user data */
 
 struct dte_addr {
@@ -85,3 +90,5 @@
 #define PRC_CONS_SEND_DONE 2   /* something unused in protosw.h */
 
 #endif                         /* _KERNEL */
+
+#endif /* !_NETISO_CONS_H_ */
diff -r b57ae1c80aa0 -r 840956ad4f0c sys/netiso/cons_pcb.h
--- a/sys/netiso/cons_pcb.h     Sat Dec 10 23:44:08 2005 +0000
+++ b/sys/netiso/cons_pcb.h     Sun Dec 11 00:01:36 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cons_pcb.h,v 1.9 2004/04/22 01:01:41 matt Exp $        */
+/*     $NetBSD: cons_pcb.h,v 1.10 2005/12/11 00:01:36 elad Exp $       */
 
 /*-
  * Copyright (c) 1991, 1993
@@ -58,6 +58,9 @@
  * ARGO Project, Computer Sciences Dept., University of Wisconsin - Madison
  */
 
+#ifndef _NETISO_CONS_PCB_H_
+#define _NETISO_CONS_PCB_H_
+
 /*
  * protocol control block for the connection oriented network service
  */
@@ -195,3 +198,5 @@
 #ifdef _KERNEL
 #define IncStat(XYZ) cons_stat.XYZ++
 #endif                         /* _KERNEL */
+
+#endif /* !_NETISO_CONS_PCB_H_ */
diff -r b57ae1c80aa0 -r 840956ad4f0c sys/netiso/eonvar.h
--- a/sys/netiso/eonvar.h       Sat Dec 10 23:44:08 2005 +0000
+++ b/sys/netiso/eonvar.h       Sun Dec 11 00:01:36 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: eonvar.h,v 1.13 2005/05/30 22:14:52 christos Exp $     */
+/*     $NetBSD: eonvar.h,v 1.14 2005/12/11 00:01:36 elad Exp $ */
 
 /*-
  * Copyright (c) 1991, 1993
@@ -58,6 +58,9 @@
  * ARGO Project, Computer Sciences Dept., University of Wisconsin - Madison
  */
 
+#ifndef _NETISO_EONVAR_H_
+#define _NETISO_EONVAR_H_
+
 #include <sys/ansi.h>
 
 #ifndef sa_family_t
@@ -183,3 +186,5 @@
 void eoninput    (struct mbuf *, ...);
 void *eonctlinput (int, struct sockaddr *, void *);
 #endif
+
+#endif /* !_NETISO_EONVAR_H_ */
diff -r b57ae1c80aa0 -r 840956ad4f0c sys/netiso/esis.h
--- a/sys/netiso/esis.h Sat Dec 10 23:44:08 2005 +0000
+++ b/sys/netiso/esis.h Sun Dec 11 00:01:36 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: esis.h,v 1.17 2005/05/29 21:27:45 christos Exp $       */
+/*     $NetBSD: esis.h,v 1.18 2005/12/11 00:01:36 elad Exp $   */
 
 /*-
  * Copyright (c) 1991, 1993
@@ -58,6 +58,9 @@
  * ARGO Project, Computer Sciences Dept., University of Wisconsin - Madison
  */
 
+#ifndef _NETISO_ESIS_H_
+#define _NETISO_ESIS_H_
+
 #include <machine/endian.h>
 
 #define        SNPAC_AGE               60      /* seconds */
@@ -143,3 +146,5 @@
 int isis_output (struct mbuf *, ...);
 void *esis_ctlinput (int, struct sockaddr *, void *);
 #endif /* _KERNEL */
+
+#endif /* !_NETISO_ESIS_H_ */
diff -r b57ae1c80aa0 -r 840956ad4f0c sys/netiso/idrp_var.h
--- a/sys/netiso/idrp_var.h     Sat Dec 10 23:44:08 2005 +0000
+++ b/sys/netiso/idrp_var.h     Sun Dec 11 00:01:36 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: idrp_var.h,v 1.7 2004/04/20 02:13:26 matt Exp $        */
+/*     $NetBSD: idrp_var.h,v 1.8 2005/12/11 00:01:36 elad Exp $        */
 
 /*-
  * Copyright (c) 1995 The NetBSD Foundation, Inc.
@@ -36,6 +36,9 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
+#ifndef _NETISO_IDRP_VAR_H_
+#define _NETISO_IDRP_VAR_H_
+
 #ifdef _KERNEL
 struct mbuf;
 
@@ -46,3 +49,5 @@
 int idrp_usrreq (struct socket *, int, struct mbuf *, struct mbuf *,
                     struct mbuf *, struct proc *);
 #endif
+
+#endif /* !_NETISO_IDRP_VAR_H_ */
diff -r b57ae1c80aa0 -r 840956ad4f0c sys/netiso/iso.h
--- a/sys/netiso/iso.h  Sat Dec 10 23:44:08 2005 +0000
+++ b/sys/netiso/iso.h  Sun Dec 11 00:01:36 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: iso.h,v 1.15 2004/04/22 01:01:41 matt Exp $    */
+/*     $NetBSD: iso.h,v 1.16 2005/12/11 00:01:36 elad Exp $    */
 
 /*-
  * Copyright (c) 1991, 1993
@@ -198,4 +198,4 @@
 
 #endif /* _KERNEL */
 
-#endif /* _NETISO_ISO_H_ */
+#endif /* !_NETISO_ISO_H_ */
diff -r b57ae1c80aa0 -r 840956ad4f0c sys/netiso/iso_errno.h
--- a/sys/netiso/iso_errno.h    Sat Dec 10 23:44:08 2005 +0000
+++ b/sys/netiso/iso_errno.h    Sun Dec 11 00:01:36 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: iso_errno.h,v 1.8 2003/08/07 16:33:36 agc Exp $        */
+/*     $NetBSD: iso_errno.h,v 1.9 2005/12/11 00:01:36 elad Exp $       */
 
 /*-
  * Copyright (c) 1991, 1993
@@ -285,4 +285,4 @@
 
 #define CONL_ERROR_MAX 0x1c3
 
-#endif                         /* _NETISO_ISO_ERRNO_H_ */
+#endif /* !_NETISO_ISO_ERRNO_H_ */
diff -r b57ae1c80aa0 -r 840956ad4f0c sys/netiso/iso_pcb.h
--- a/sys/netiso/iso_pcb.h      Sat Dec 10 23:44:08 2005 +0000
+++ b/sys/netiso/iso_pcb.h      Sun Dec 11 00:01:36 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: iso_pcb.h,v 1.12 2005/11/16 20:44:19 dsl Exp $ */
+/*     $NetBSD: iso_pcb.h,v 1.13 2005/12/11 00:01:36 elad Exp $        */
 
 /*-
  * Copyright (c) 1991, 1993
@@ -58,6 +58,9 @@
  * ARGO Project, Computer Sciences Dept., University of Wisconsin - Madison
  */
 
+#ifndef _NETISO_ISO_PCB_H_
+#define _NETISO_ISO_PCB_H_
+
 #define        MAXX25CRUDLEN   16      /* 16 bytes of call request user data */
 
 /*
@@ -124,3 +127,5 @@
 struct isopcb  *iso_pcblookup (struct isopcb *, int, caddr_t,
                                   struct sockaddr_iso *);
 #endif
+
+#endif /* !_NETISO_ISO_PCB_H_ */
diff -r b57ae1c80aa0 -r 840956ad4f0c sys/netiso/iso_snpac.h
--- a/sys/netiso/iso_snpac.h    Sat Dec 10 23:44:08 2005 +0000
+++ b/sys/netiso/iso_snpac.h    Sun Dec 11 00:01:36 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: iso_snpac.h,v 1.10 2003/08/07 16:33:37 agc Exp $       */
+/*     $NetBSD: iso_snpac.h,v 1.11 2005/12/11 00:01:36 elad Exp $      */
 
 /*-
  * Copyright (c) 1991, 1993
@@ -58,6 +58,9 @@
Prev by Date: [src/trunk]: src/sys Multiple inclusion protection, as suggested by christos@...
Next by Date: [src/trunk]: src/sys/arch/i386/conf Add a small device to control brightness ...
Previous by Thread: [src/trunk]: src/sys Multiple inclusion protection, as suggested by christos@...
Next by Thread: [src/trunk]: src/sys/arch/i386/conf Add a small device to control brightness ...
Indexes:
Home | Main Index | Thread Index | Old Index