From owner-cvs-all Fri Dec 3 2: 4:58 1999 Delivered-To: cvs-all@freebsd.org Received: from alpo.whistle.com (alpo.whistle.com [207.76.204.38]) by hub.freebsd.org (Postfix) with ESMTP id 96A31150A3; Fri, 3 Dec 1999 02:04:52 -0800 (PST) (envelope-from julian@whistle.com) Received: from current1.whiste.com (current1.whistle.com [207.76.205.22]) by alpo.whistle.com (8.9.1a/8.9.1) with ESMTP id CAA81921; Fri, 3 Dec 1999 02:00:42 -0800 (PST) Date: Fri, 3 Dec 1999 02:00:41 -0800 (PST) From: Julian Elischer To: Maxim Sobolev Cc: Archie Cobbs , cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: Re: cvs commit: src/sys/net bpf.h bpf_filter.c In-Reply-To: Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: owner-cvs-all@FreeBSD.ORG Precedence: bulk fixed. Thanks for letting us know. The concept of testing WITHOUT the option in question hadn't occured to us :-) On Fri, 3 Dec 1999, Julian Elischer wrote: > i > > On Fri, 3 Dec 1999, Maxim Sobolev wrote: > > > Archie Cobbs wrote: > > > > > archie 1999/12/02 11:36:06 PST > > > > > > Modified files: > > > sys/net bpf.h bpf_filter.c > > > Log: > > > Add 'const' to the bpf_filter() and bpf_validate() prototypes. > > > Remove a stale comment from bpf_validate(). > > > > It seems that this commit broke kernel builds for kernels w/o "pseudo-device > > bpf": > > > > cc -c -O2 -pipe -march=pentium -Wall -Wredundant-decls -Wnested-externs > > -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual > > -fformat -extensions -ansi -nostdinc -I- -I. -I../.. -I../../../include > > -DKERNEL -include opt_global.h -D_KERNEL -elf -mpreferred-stack-boundary=2 > > ../../net/bpf.c > > ../../net/bpf.c: In function `bpf_filter': > > ../../net/bpf.c:1316: argument `pc' doesn't match prototype > > ../../net/bpf.h:234: prototype declaration > > *** Error code 1 > > > > > does the following fix it? > > cvs server: Diffing . > Index: bpf.c > =================================================================== > RCS file: /cvs/freebsd/src/sys/net/bpf.c,v > retrieving revision 1.57 > diff -c -r1.57 bpf.c > *** bpf.c 1999/11/03 21:32:28 1.57 > --- bpf.c 1999/12/03 09:54:22 > *************** > *** 1309,1315 **** > > u_int > bpf_filter(pc, p, wirelen, buflen) > ! register struct bpf_insn *pc; > register u_char *p; > u_int wirelen; > register u_int buflen; > --- 1309,1315 ---- > > u_int > bpf_filter(pc, p, wirelen, buflen) > ! register const struct bpf_insn *pc; > register u_char *p; > u_int wirelen; > register u_int buflen; > > Note: apply by hand.. cut'n'pasted.. > > > > -Maxim > > > > > > > > > To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe cvs-all" in the body of the message