diff options
| author | wollman <wollman@FreeBSD.org> | 1995-02-07 19:05:12 +0000 |
|---|---|---|
| committer | wollman <wollman@FreeBSD.org> | 1995-02-07 19:05:12 +0000 |
| commit | 3b59d5225b99046409c631470968206e23d46232 (patch) | |
| tree | ecca8c001f3b3b012e9b9f4905a1ebb9af29b6bf /sys/net/route.h | |
| parent | e6d3fa5c498e712307c09794366e09344c96347e (diff) | |
| download | FreeBSD-src-3b59d5225b99046409c631470968206e23d46232.zip FreeBSD-src-3b59d5225b99046409c631470968206e23d46232.tar.gz | |
Correct fix for merge conflicts: RTM_VERSION is always 5. Header files
included by user code must never depend on kernel compile options.
Diffstat (limited to 'sys/net/route.h')
| -rw-r--r-- | sys/net/route.h | 6 |
1 files changed, 1 insertions, 5 deletions
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 */ |
