From 3b59d5225b99046409c631470968206e23d46232 Mon Sep 17 00:00:00 2001
From: wollman <wollman@FreeBSD.org>
Date: Tue, 7 Feb 1995 19:05:12 +0000
Subject: Correct fix for merge conflicts: RTM_VERSION is always 5.  Header
 files included by user code must never depend on kernel compile options.

---
 sys/net/route.h | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'sys/net/route.h')

diff --git a/sys/net/route.h b/sys/net/route.h
index 81e1a7f..fe162e0 100644
--- a/sys/net/route.h
+++ b/sys/net/route.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)route.h	8.3 (Berkeley) 4/19/94
- * $Id: route.h,v 1.9 1995/02/07 02:01:48 wollman Exp $
+ * $Id: route.h,v 1.10 1995/02/07 06:19:56 davidg Exp $
  */
 
 #ifndef _NET_ROUTE_H_
@@ -185,10 +185,6 @@ struct rt_msghdr {
 };
 
 #define RTM_VERSION	5	/* Up the ante and ignore older versions */
-#ifdef TTCP
-#undef	RTM_VERSION
-#define	RTM_VERSION	6	/* T/TCP requires changes in the rmx */
-#endif
 
 #define RTM_ADD		0x1	/* Add Route */
 #define RTM_DELETE	0x2	/* Delete Route */
-- 
cgit v1.1