d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed unresolved CVS conflict on RTM_VERSION.

Browse Source
This commit is contained in:
David Greenman 1995-02-07 06:19:56 +00:00
parent 16be381004
commit e128aa716c
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sys/net/route.h
View File

@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)route.h 8.3 (Berkeley) 4/19/94
* $Id: route.h,v 1.8 1995/01/24 04:47:33 bde Exp $
* $Id: route.h,v 1.9 1995/02/07 02:01:48 wollman Exp $
*/
#ifndef _NET_ROUTE_H_
@ -184,17 +184,11 @@ struct rt_msghdr {
struct rt_metrics rtm_rmx; /* metrics themselves */
};
<<<<<<< route.h
#define RTM_VERSION 5 /* Up the ante and ignore older versions */
||||||| 1.5.4.1
#define RTM_VERSION 3 /* Up the ante and ignore older versions */
=======
#define RTM_VERSION 3 /* Up the ante and ignore older versions */
#ifdef TTCP
#undef RTM_VERSION
#define RTM_VERSION 4 /* T/TCP requires changes in the rmx */
#define RTM_VERSION 6 /* T/TCP requires changes in the rmx */
#endif
>>>>>>> /tmp/T4000726
#define RTM_ADD 0x1 /* Add Route */
#define RTM_DELETE 0x2 /* Delete Route */