Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/netinet Remove a duplicated check for the NetBSD callout...



details:   https://anonhg.NetBSD.org/src/rev/d244c9aabb12
branches:  trunk
changeset: 487733:d244c9aabb12
user:      veego <veego%NetBSD.org@localhost>
date:      Mon Jun 12 10:41:36 2000 +0000

description:
Remove a duplicated check for the NetBSD callout (I think it is a mistake
from a previous conflict resolve which doesn't cause harm).

diffstat:

 sys/netinet/ip_fil.c |  8 ++------
 1 files changed, 2 insertions(+), 6 deletions(-)

diffs (29 lines):

diff -r 021127b386bc -r d244c9aabb12 sys/netinet/ip_fil.c
--- a/sys/netinet/ip_fil.c      Mon Jun 12 10:40:37 2000 +0000
+++ b/sys/netinet/ip_fil.c      Mon Jun 12 10:41:36 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ip_fil.c,v 1.54 2000/06/12 10:28:21 veego Exp $        */
+/*     $NetBSD: ip_fil.c,v 1.55 2000/06/12 10:41:36 veego Exp $        */
 
 /*
  * Copyright (C) 1993-2000 by Darren Reed.
@@ -9,7 +9,7 @@
  */
 #if !defined(lint)
 #if defined(__NetBSD__)
-static const char rcsid[] = "$NetBSD: ip_fil.c,v 1.54 2000/06/12 10:28:21 veego Exp $";
+static const char rcsid[] = "$NetBSD: ip_fil.c,v 1.55 2000/06/12 10:41:36 veego Exp $";
 #else
 static const char sccsid[] = "@(#)ip_fil.c     2.41 6/5/96 (C) 1993-2000 Darren Reed";
 static const char rcsid[] = "@(#)Id: ip_fil.c,v 2.42.2.10 2000/05/25 20:16:44 darrenr Exp";
@@ -170,10 +170,6 @@
 #endif
 int    fr_running = 0;
 
-#if defined(__NetBSD__)
-#include <sys/callout.h>
-struct callout ipfr_slowtimer_ch;
-#endif
 #if (__FreeBSD_version >= 300000) && defined(_KERNEL)
 struct callout_handle ipfr_slowtimer_ch;
 #endif



Home | Main Index | Thread Index | Old Index