Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Resolve conflicts from merge of 3.2a7, take 2.

Browse Source
This commit is contained in:
thorpej 1997-05-28 00:22:15 +00:00
parent 41d4822677
commit 9062a97000
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/lkm/netinet/if_ipl/Makefile
View File

@ -1,11 +1,11 @@
# $NetBSD: Makefile,v 1.3 1997/03/29 03:03:08 thorpej Exp $
# $NetBSD: Makefile,v 1.4 1997/05/28 00:22:15 thorpej Exp $
.include "../Makefile.inc"
.PATH: $S/netinet
KMOD= if_ipl
SRCS= ip_fil.c fil.c mln_ipl.c ip_nat.c ip_frag.c ip_state.c
SRCS= ip_fil.c fil.c mln_ipl.c ip_nat.c ip_frag.c ip_state.c ip_proxy.c
NOMAN= yes
CFLAGS+=-DIPFILTER_LKM

4
sys/lkm/netinet/if_ipl/ipl.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: ipl.h,v 1.2 1997/03/29 01:42:34 thorpej Exp $ */
/* $NetBSD: ipl.h,v 1.3 1997/05/28 00:22:16 thorpej Exp $ */
/*
* (C)opyright 1993-1996 by Darren Reed.
@ -13,6 +13,6 @@
#ifndef __IPL_H_
#define __IPL_H__
#define IPL_VERSION "IP Filter v3.2alpha2"
#define IPL_VERSION "IP Filter v3.2alpha7"
#endif