Change double include protection style in headers to match

the rest of Netgraph code.

Reviewed by: imp, ru
Approved by: imp (mentor)

17 files changed, 17 insertions, 17 deletions

diff --git a/sys/netgraph/bluetooth/drivers/h4/ng_h4_prse.h b/sys/netgraph/bluetooth/drivers/h4/ng_h4_prse.h
index 7ed646e..a4e74a4 100644
--- a/sys/netgraph/bluetooth/drivers/h4/ng_h4_prse.h
+++ b/sys/netgraph/bluetooth/drivers/h4/ng_h4_prse.h
@@ -36,7 +36,7 @@
  ***************************************************************************/
 
 #ifndef _NETGRAPH_H4_PRSE_H_
-#define _NETGRAPH_H4_PRSE_H_ 1
+#define _NETGRAPH_H4_PRSE_H_
 
 /* 
  * H4 node command list
diff --git a/sys/netgraph/bluetooth/drivers/h4/ng_h4_var.h b/sys/netgraph/bluetooth/drivers/h4/ng_h4_var.h
index f6ac7fe..932a04e 100644
--- a/sys/netgraph/bluetooth/drivers/h4/ng_h4_var.h
+++ b/sys/netgraph/bluetooth/drivers/h4/ng_h4_var.h
@@ -36,7 +36,7 @@
  */
 
 #ifndef _NETGRAPH_H4_VAR_H_
-#define _NETGRAPH_H4_VAR_H_ 1
+#define _NETGRAPH_H4_VAR_H_
 
 /*
  * Malloc declaration
diff --git a/sys/netgraph/bluetooth/hci/ng_hci_cmds.h b/sys/netgraph/bluetooth/hci/ng_hci_cmds.h
index 6cf75d6..781e9fc 100644
--- a/sys/netgraph/bluetooth/hci/ng_hci_cmds.h
+++ b/sys/netgraph/bluetooth/hci/ng_hci_cmds.h
@@ -30,7 +30,7 @@
  */
 
 #ifndef _NETGRAPH_HCI_CMDS_H_
-#define _NETGRAPH_HCI_CMDS_H_ 1
+#define _NETGRAPH_HCI_CMDS_H_
 
 /* 
  * HCI command return parameters processing routines
diff --git a/sys/netgraph/bluetooth/hci/ng_hci_evnt.h b/sys/netgraph/bluetooth/hci/ng_hci_evnt.h
index 497dda0..09769da 100644
--- a/sys/netgraph/bluetooth/hci/ng_hci_evnt.h
+++ b/sys/netgraph/bluetooth/hci/ng_hci_evnt.h
@@ -30,7 +30,7 @@
  */
 
 #ifndef _NETGRAPH_HCI_EVNT_H_
-#define _NETGRAPH_HCI_EVNT_H_ 1
+#define _NETGRAPH_HCI_EVNT_H_
 
 /*
  * HCI events processing routines
diff --git a/sys/netgraph/bluetooth/hci/ng_hci_misc.h b/sys/netgraph/bluetooth/hci/ng_hci_misc.h
index 6d1a61f..33250f2 100644
--- a/sys/netgraph/bluetooth/hci/ng_hci_misc.h
+++ b/sys/netgraph/bluetooth/hci/ng_hci_misc.h
@@ -30,7 +30,7 @@
  */
 
 #ifndef _NETGRAPH_HCI_MISC_H_
-#define _NETGRAPH_HCI_MISC_H_ 1
+#define _NETGRAPH_HCI_MISC_H_
 
 void              ng_hci_mtap                   (ng_hci_unit_p, struct mbuf *);
 void              ng_hci_node_is_up             (node_p, hook_p, void *, int);
diff --git a/sys/netgraph/bluetooth/hci/ng_hci_prse.h b/sys/netgraph/bluetooth/hci/ng_hci_prse.h
index dd8ff06..5f0e3f0 100644
--- a/sys/netgraph/bluetooth/hci/ng_hci_prse.h
+++ b/sys/netgraph/bluetooth/hci/ng_hci_prse.h
@@ -36,7 +36,7 @@
  ***************************************************************************/
 
 #ifndef _NETGRAPH_HCI_PRSE_H_
-#define _NETGRAPH_HCI_PRSE_H_ 1
+#define _NETGRAPH_HCI_PRSE_H_
 
 /* BDADDR */
 static const struct ng_parse_fixedarray_info	ng_hci_bdaddr_type_info = {
diff --git a/sys/netgraph/bluetooth/hci/ng_hci_var.h b/sys/netgraph/bluetooth/hci/ng_hci_var.h
index c0adccc..8672991 100644
--- a/sys/netgraph/bluetooth/hci/ng_hci_var.h
+++ b/sys/netgraph/bluetooth/hci/ng_hci_var.h
@@ -30,7 +30,7 @@
  */
 
 #ifndef _NETGRAPH_HCI_VAR_H_
-#define _NETGRAPH_HCI_VAR_H_ 1
+#define _NETGRAPH_HCI_VAR_H_
 
 /* MALLOC decalation */
 #ifdef NG_SEPARATE_MALLOC
diff --git a/sys/netgraph/bluetooth/include/ng_bluetooth.h b/sys/netgraph/bluetooth/include/ng_bluetooth.h
index e4b4846..387504a 100644
--- a/sys/netgraph/bluetooth/include/ng_bluetooth.h
+++ b/sys/netgraph/bluetooth/include/ng_bluetooth.h
@@ -30,7 +30,7 @@
  */
 
 #ifndef _NETGRAPH_BLUETOOTH_H_
-#define _NETGRAPH_BLUETOOTH_H_ 1
+#define _NETGRAPH_BLUETOOTH_H_
 
 /*
  * Version of the stack
diff --git a/sys/netgraph/bluetooth/include/ng_btsocket.h b/sys/netgraph/bluetooth/include/ng_btsocket.h
index 2a133a3..6bdc607 100644
--- a/sys/netgraph/bluetooth/include/ng_btsocket.h
+++ b/sys/netgraph/bluetooth/include/ng_btsocket.h
@@ -30,7 +30,7 @@
  */
 
 #ifndef _NETGRAPH_BTSOCKET_H_
-#define _NETGRAPH_BTSOCKET_H_ 1
+#define _NETGRAPH_BTSOCKET_H_
 
 /*
  * XXX FIXME: does not belong here, move to sys/socket.h later and fix AF_MAX
diff --git a/sys/netgraph/bluetooth/include/ng_btsocket_hci_raw.h b/sys/netgraph/bluetooth/include/ng_btsocket_hci_raw.h
index c3af9e9..129ebb6 100644
--- a/sys/netgraph/bluetooth/include/ng_btsocket_hci_raw.h
+++ b/sys/netgraph/bluetooth/include/ng_btsocket_hci_raw.h
@@ -30,7 +30,7 @@
  */
 
 #ifndef _NETGRAPH_BTSOCKET_HCI_RAW_H_
-#define _NETGRAPH_BTSOCKET_HCI_RAW_H_ 1
+#define _NETGRAPH_BTSOCKET_HCI_RAW_H_
 
 #define NG_BTSOCKET_HCI_RAW_SENDSPACE	(4 * 1024)
 #define NG_BTSOCKET_HCI_RAW_RECVSPACE	(4 * 1024)
diff --git a/sys/netgraph/bluetooth/include/ng_btsocket_l2cap.h b/sys/netgraph/bluetooth/include/ng_btsocket_l2cap.h
index 093b22a..7498149 100644
--- a/sys/netgraph/bluetooth/include/ng_btsocket_l2cap.h
+++ b/sys/netgraph/bluetooth/include/ng_btsocket_l2cap.h
@@ -30,7 +30,7 @@
  */
 
 #ifndef _NETGRAPH_BTSOCKET_L2CAP_H_
-#define _NETGRAPH_BTSOCKET_L2CAP_H_ 1
+#define _NETGRAPH_BTSOCKET_L2CAP_H_
 
 /*
  * L2CAP routing entry
diff --git a/sys/netgraph/bluetooth/include/ng_btsocket_rfcomm.h b/sys/netgraph/bluetooth/include/ng_btsocket_rfcomm.h
index 21bfb3e..e3d8aa9 100644
--- a/sys/netgraph/bluetooth/include/ng_btsocket_rfcomm.h
+++ b/sys/netgraph/bluetooth/include/ng_btsocket_rfcomm.h
@@ -30,7 +30,7 @@
  */
 
 #ifndef _NETGRAPH_BTSOCKET_RFCOMM_H_
-#define _NETGRAPH_BTSOCKET_RFCOMM_H_ 1
+#define _NETGRAPH_BTSOCKET_RFCOMM_H_
 
 /*****************************************************************************
  *****************************************************************************
diff --git a/sys/netgraph/bluetooth/include/ng_h4.h b/sys/netgraph/bluetooth/include/ng_h4.h
index f590277..08f14f2 100644
--- a/sys/netgraph/bluetooth/include/ng_h4.h
+++ b/sys/netgraph/bluetooth/include/ng_h4.h
@@ -44,7 +44,7 @@
  */
 
 #ifndef _NETGRAPH_H4_H_
-#define _NETGRAPH_H4_H_ 1
+#define _NETGRAPH_H4_H_
 
 /*
  * H4 line discipline 
diff --git a/sys/netgraph/bluetooth/include/ng_hci.h b/sys/netgraph/bluetooth/include/ng_hci.h
index 3bea725..ba7796f 100644
--- a/sys/netgraph/bluetooth/include/ng_hci.h
+++ b/sys/netgraph/bluetooth/include/ng_hci.h
@@ -43,7 +43,7 @@
  */
 
 #ifndef _NETGRAPH_HCI_H_
-#define _NETGRAPH_HCI_H_ 1
+#define _NETGRAPH_HCI_H_
 
 /**************************************************************************
  **************************************************************************
diff --git a/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.h b/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.h
index 310f676..b588e17 100644
--- a/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.h
+++ b/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.h
@@ -30,7 +30,7 @@
  */
 
 #ifndef _NETGRAPH_L2CAP_MISC_H_
-#define _NETGRAPH_L2CAP_MISC_H_ 1
+#define _NETGRAPH_L2CAP_MISC_H_
 
 void           ng_l2cap_send_hook_info (node_p, hook_p, void *, int);
 
diff --git a/sys/netgraph/bluetooth/l2cap/ng_l2cap_prse.h b/sys/netgraph/bluetooth/l2cap/ng_l2cap_prse.h
index 7c64e7c..08a9169 100644
--- a/sys/netgraph/bluetooth/l2cap/ng_l2cap_prse.h
+++ b/sys/netgraph/bluetooth/l2cap/ng_l2cap_prse.h
@@ -36,7 +36,7 @@
  ***************************************************************************/
 
 #ifndef _NETGRAPH_L2CAP_PRSE_H_
-#define _NETGRAPH_L2CAP_PRSE_H_ 1
+#define _NETGRAPH_L2CAP_PRSE_H_
 
 /* 
  * L2CAP node command list
diff --git a/sys/netgraph/bluetooth/l2cap/ng_l2cap_var.h b/sys/netgraph/bluetooth/l2cap/ng_l2cap_var.h
index f643b51..05bd0ab 100644
--- a/sys/netgraph/bluetooth/l2cap/ng_l2cap_var.h
+++ b/sys/netgraph/bluetooth/l2cap/ng_l2cap_var.h
@@ -30,7 +30,7 @@
  */
 
 #ifndef _NETGRAPH_L2CAP_VAR_H_
-#define _NETGRAPH_L2CAP_VAR_H_ 1
+#define _NETGRAPH_L2CAP_VAR_H_
 
 /* MALLOC decalation */
 #ifdef NG_SEPARATE_MALLOC