[src/trunk]: src/sys/dev multiple inclusion protection

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

details:   https://anonhg.NetBSD.org/src/rev/e1d2ad057fb4
branches:  trunk
changeset: 485848:e1d2ad057fb4
user:      wiz <wiz%NetBSD.org@localhost>
date:      Sun May 07 03:01:58 2000 +0000

description:
multiple inclusion protection

diffstat:

 sys/dev/ic/bt8xx.h           |  6 +++++-
 sys/dev/pci/bktr/bktr2netbsd |  6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diffs (44 lines):

diff -r 673196d3cf09 -r e1d2ad057fb4 sys/dev/ic/bt8xx.h
--- a/sys/dev/ic/bt8xx.h        Sun May 07 02:04:20 2000 +0000
+++ b/sys/dev/ic/bt8xx.h        Sun May 07 03:01:58 2000 +0000
@@ -1,7 +1,10 @@
-/*     $NetBSD: bt8xx.h,v 1.1.1.1 2000/05/07 00:17:13 wiz Exp $        */
+/*     $NetBSD: bt8xx.h,v 1.2 2000/05/07 03:01:59 wiz Exp $    */
 
 /* This file is merged from ioctl_meteor.h and ioctl_bt848.h from FreeBSD. */
 /* The copyright below only applies to the ioctl_meteor.h part of this file. */
+
+#ifndef _DEV_IC_BT8XX_H_
+#define _DEV_IC_BT8XX_H_
 /*
  * Copyright (c) 1995 Mark Tinguely and Jim Lowe
  * All rights reserved.
@@ -469,3 +472,4 @@
 
 
 
+#endif /* _DEV_IC_BT8XX_H_ */
diff -r 673196d3cf09 -r e1d2ad057fb4 sys/dev/pci/bktr/bktr2netbsd
--- a/sys/dev/pci/bktr/bktr2netbsd      Sun May 07 02:04:20 2000 +0000
+++ b/sys/dev/pci/bktr/bktr2netbsd      Sun May 07 03:01:58 2000 +0000
@@ -1,6 +1,6 @@
 #! /bin/sh
 #
-#      $NetBSD: bktr2netbsd,v 1.1 2000/05/07 00:24:33 wiz Exp $
+#      $NetBSD: bktr2netbsd,v 1.2 2000/05/07 03:01:58 wiz Exp $
 #
 # Copyright (c) 2000 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -87,8 +87,12 @@
 echo merging ioctl_meteor.h and ioctl_bt848.h to bt8xx.h
 echo "/* This file is merged from ioctl_meteor.h and ioctl_bt848.h from FreeBSD. */" > bt8xx.h
 echo "/* The copyright below only applies to the ioctl_meteor.h part of this file. */" >> bt8xx.h
+echo "" >> bt8xx.h
+echo "#ifndef _DEV_IC_BT8XX_H_" >> bt8xx.h
+echo "#define _DEV_IC_BT8XX_H_" >> bt8xx.h
 cat ioctl_meteor.h ioctl_bt848.h | grep -v _MACHINE_IOCTL_METEOR_H_ | \
        grep -v _MACHINE_IOCTL_BT848_H >> bt8xx.h
+echo "#endif /* _DEV_IC_BT8XX_H_ */" >> bt8xx.h
 rm ioctl_meteor.h ioctl_bt848.h
 
 ### Add our NetBSD RCS Id