Turn DIAGNOSTIC into a new-style option.

7 files changed, 14 insertions, 6 deletions

diff --git a/sys/netinet/if_atm.c b/sys/netinet/if_atm.c
index 1c60ef0..1db865a 100644
--- a/sys/netinet/if_atm.c
+++ b/sys/netinet/if_atm.c
@@ -36,6 +36,7 @@
  * IP <=> ATM address resolution.
  */
 
+#include "opt_diagnostic.h"
 #include "opt_inet.h"
 #include "opt_natm.h"
 
diff --git a/sys/netinet/in_rmx.c b/sys/netinet/in_rmx.c
index 2d9c9da..231581c 100644
--- a/sys/netinet/in_rmx.c
+++ b/sys/netinet/in_rmx.c
@@ -26,7 +26,7 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: in_rmx.c,v 1.29 1997/02/14 18:15:45 wollman Exp $
+ *	$Id: in_rmx.c,v 1.30 1997/08/02 14:32:50 bde Exp $
  */
 
 /*
@@ -42,6 +42,8 @@
  *     indefinitely.  See in_rtqtimo() below for the exact mechanism.
  */
 
+#include "opt_diagnostic.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
diff --git a/sys/netinet/ip_divert.c b/sys/netinet/ip_divert.c
index 66ef08b..6828b3f 100644
--- a/sys/netinet/ip_divert.c
+++ b/sys/netinet/ip_divert.c
@@ -30,9 +30,10 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ip_divert.c,v 1.17 1998/01/08 23:41:50 eivind Exp $
+ *	$Id: ip_divert.c,v 1.18 1998/01/27 09:15:06 davidg Exp $
  */
 
+#include "opt_diagnostic.h"
 #include "opt_inet.h"
 
 #ifndef INET
diff --git a/sys/netinet/ip_fw.c b/sys/netinet/ip_fw.c
index a2295a8..6525e78 100644
--- a/sys/netinet/ip_fw.c
+++ b/sys/netinet/ip_fw.c
@@ -12,7 +12,7 @@
  *
  * This software is provided ``AS IS'' without any warranties of any kind.
  *
- *	$Id: ip_fw.c,v 1.72 1998/01/08 03:03:53 alex Exp $
+ *	$Id: ip_fw.c,v 1.73 1998/01/08 23:41:52 eivind Exp $
  */
 
 /*
@@ -20,6 +20,7 @@
  */
 
 #ifndef IPFIREWALL_MODULE
+#include "opt_diagnostic.h"
 #include "opt_ipfw.h"
 #include "opt_ipdivert.h"
 #include "opt_inet.h"
diff --git a/sys/netinet/ip_input.c b/sys/netinet/ip_input.c
index 504e86b..456d7be 100644
--- a/sys/netinet/ip_input.c
+++ b/sys/netinet/ip_input.c
@@ -31,13 +31,14 @@
  * SUCH DAMAGE.
  *
  *	@(#)ip_input.c	8.2 (Berkeley) 1/4/94
- * $Id: ip_input.c,v 1.72 1997/11/13 22:57:57 julian Exp $
+ * $Id: ip_input.c,v 1.73 1998/01/09 03:21:04 eivind Exp $
  *	$ANA: ip_input.c,v 1.5 1996/09/18 14:34:59 wollman Exp $
  */
 
 #define	_IP_VHL
 
 #include "opt_bootp.h"
+#include "opt_diagnostic.h"
 #include "opt_ipfw.h"
 #include "opt_ipdivert.h"
 
diff --git a/sys/netinet/ip_mroute.c b/sys/netinet/ip_mroute.c
index fa6809e..0885dc2 100644
--- a/sys/netinet/ip_mroute.c
+++ b/sys/netinet/ip_mroute.c
@@ -9,9 +9,10 @@
  * Modified by Bill Fenner, PARC, April 1995
  *
  * MROUTING Revision: 3.5
- * $Id: ip_mroute.c,v 1.41 1997/09/21 22:01:38 gibbs Exp $
+ * $Id: ip_mroute.c,v 1.42 1997/10/28 15:58:50 bde Exp $
  */
 
+#include "opt_diagnostic.h"
 #include "opt_mrouting.h"
 
 #include <sys/param.h>
diff --git a/sys/netinet/ip_output.c b/sys/netinet/ip_output.c
index 5a52887..317b4d1 100644
--- a/sys/netinet/ip_output.c
+++ b/sys/netinet/ip_output.c
@@ -31,11 +31,12 @@
  * SUCH DAMAGE.
  *
  *	@(#)ip_output.c	8.3 (Berkeley) 1/21/94
- *	$Id: ip_output.c,v 1.61 1997/11/05 20:17:23 joerg Exp $
+ *	$Id: ip_output.c,v 1.62 1997/11/07 09:20:45 phk Exp $
  */
 
 #define _IP_VHL
 
+#include "opt_diagnostic.h"
 #include "opt_ipdivert.h"
 
 #include <sys/param.h>