[src/trunk]: src/sys/netccitt Add multiple-include prevention to several head...

[sommerfeld <sommerfeld%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/2e09e5291c80
branches:  trunk
changeset: 494132:2e09e5291c80
user:      sommerfeld <sommerfeld%NetBSD.org@localhost>
date:      Sun Jul 02 17:34:01 2000 +0000

description:
Add multiple-include prevention to several headers which were missing
it.

Split ccittintr() declaration into a separate header file so that the
non-namespace-safe cruft in pk.h doesn't interfere with other
subsystems which happen to include netisr.h

[Clean up after the Keystone Kwality Kops]

diffstat:

 sys/netccitt/pk.h        |   7 ++++++-
 sys/netccitt/pk_extern.h |   6 ++++--
 sys/netccitt/x25.h       |   7 ++++++-
 sys/netccitt/x25isr.h    |  44 ++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 60 insertions(+), 4 deletions(-)

diffs (125 lines):

diff -r 1a50fa9787b3 -r 2e09e5291c80 sys/netccitt/pk.h
--- a/sys/netccitt/pk.h Sun Jul 02 16:40:14 2000 +0000
+++ b/sys/netccitt/pk.h Sun Jul 02 17:34:01 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pk.h,v 1.7 1998/09/13 16:21:18 christos Exp $  */
+/*     $NetBSD: pk.h,v 1.8 2000/07/02 17:34:01 sommerfeld Exp $        */
 
 /*
  * Copyright (c) 1984 University of British Columbia.
@@ -40,6 +40,9 @@
  *     @(#)pk.h        8.1 (Berkeley) 6/10/93
  */
 
+#ifndef _NETCCITT_PK_H_
+#define _NETCCITT_PK_H_
+
 /*
  *
  *  X.25 Packet Level Definitions:
@@ -208,3 +211,5 @@
 #define        DTE_PRETENDDTE          0x0020
 
 #define MAXRESTARTCOLLISIONS   10
+
+#endif /* _NETCCITT_PK_H_ */
diff -r 1a50fa9787b3 -r 2e09e5291c80 sys/netccitt/pk_extern.h
--- a/sys/netccitt/pk_extern.h  Sun Jul 02 16:40:14 2000 +0000
+++ b/sys/netccitt/pk_extern.h  Sun Jul 02 17:34:01 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pk_extern.h,v 1.5 1998/09/13 16:21:18 christos Exp $   */
+/*     $NetBSD: pk_extern.h,v 1.6 2000/07/02 17:34:01 sommerfeld Exp $ */
 
 /*-
  * Copyright (c) 1995 The NetBSD Foundation, Inc.
@@ -37,6 +37,9 @@
  */
 
 #ifdef _KERNEL
+
+#include <netccitt/x25isr.h>
+
 struct pklcd;
 struct mbuf_cache;
 struct x25_ifaddr;
@@ -55,7 +58,6 @@
 void mbuf_cache __P((struct mbuf_cache *, struct mbuf *));
 
 /* pk_input.c */
-void ccittintr __P((void));
 struct pkcb *pk_newlink __P((struct x25_ifaddr *, caddr_t));
 int pk_dellink __P((struct pkcb *));
 int pk_resize __P((struct pkcb *));
diff -r 1a50fa9787b3 -r 2e09e5291c80 sys/netccitt/x25.h
--- a/sys/netccitt/x25.h        Sun Jul 02 16:40:14 2000 +0000
+++ b/sys/netccitt/x25.h        Sun Jul 02 17:34:01 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: x25.h,v 1.9 2000/03/13 23:52:40 soren Exp $    */
+/*     $NetBSD: x25.h,v 1.10 2000/07/02 17:34:01 sommerfeld Exp $      */
 
 /*
  * Copyright (c) 1984 University of British Columbia.
@@ -43,6 +43,9 @@
  *     @(#)x25.h       8.1 (Berkeley) 6/10/93
  */
 
+#ifndef _NETCCITT_X25_H_
+#define _NETCCITT_X25_H_
+
 #ifdef _KERNEL
 #define PRC_IFUP       3
 #define PRC_LINKUP     4
@@ -182,3 +185,5 @@
 int pk_rtattach __P((struct socket *, struct mbuf *));
 int x25_rtattach __P((struct pklcd *, struct rtentry *));
 #endif
+
+#endif /* _NETCCITT_X25_H_ */
diff -r 1a50fa9787b3 -r 2e09e5291c80 sys/netccitt/x25isr.h
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/netccitt/x25isr.h     Sun Jul 02 17:34:01 2000 +0000
@@ -0,0 +1,44 @@
+/*     $NetBSD: x25isr.h,v 1.1 2000/07/02 17:34:01 sommerfeld Exp $    */
+
+/*-
+ * Copyright (c) 2000 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Christos Zoulas.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *     This product includes software developed by the NetBSD
+ *     Foundation, Inc. and its contributors.
+ * 4. Neither the name of The NetBSD Foundation nor the names of its
+ *    contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef _NETCCITT_X25ISR_H_
+#define _NETCCITT_X25ISR_H_
+
+void ccittintr __P((void));
+
+#endif /* _NETCCITT_X25ISR_H_ */