Source-Changes-HG archive

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

[src/trunk]: src/dist/ipf/ipsend Correct merge error from import.



details:   https://anonhg.NetBSD.org/src/rev/a7e71f8e908f
branches:  trunk
changeset: 773316:a7e71f8e908f
user:      darrenr <darrenr%NetBSD.org@localhost>
date:      Mon Jan 30 20:10:27 2012 +0000

description:
Correct merge error from import.

diffstat:

 dist/ipf/ipsend/sbpf.c |  3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diffs (17 lines):

diff -r ff654092aaea -r a7e71f8e908f dist/ipf/ipsend/sbpf.c
--- a/dist/ipf/ipsend/sbpf.c    Mon Jan 30 20:08:31 2012 +0000
+++ b/dist/ipf/ipsend/sbpf.c    Mon Jan 30 20:10:27 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: sbpf.c,v 1.9 2012/01/30 16:12:03 darrenr Exp $ */
+/*     $NetBSD: sbpf.c,v 1.10 2012/01/30 20:10:27 darrenr Exp $        */
 
 /*
  * (C)opyright 1995-1998 Darren Reed. (from tcplog)
@@ -28,6 +28,7 @@
 #include <netinet/in.h>
 #include <netinet/in_systm.h>
 #include <netinet/ip.h>
+#include <netinet/ip_var.h>
 #include <netinet/udp.h>
 #include <netinet/tcp.h>
 



Home | Main Index | Thread Index | Old Index