From owner-p4-projects@FreeBSD.ORG  Mon Dec 24 21:48:23 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 41B4D16A41A; Mon, 24 Dec 2007 21:48:23 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id C9AD716A418
	for <perforce@freebsd.org>; Mon, 24 Dec 2007 21:48:22 +0000 (UTC)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id B039E13C457
	for <perforce@freebsd.org>; Mon, 24 Dec 2007 21:48:22 +0000 (UTC)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBOLmMW5030802
	for <perforce@freebsd.org>; Mon, 24 Dec 2007 21:48:22 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBOLmMgo030799
	for perforce@freebsd.org; Mon, 24 Dec 2007 21:48:22 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Mon, 24 Dec 2007 21:48:22 GMT
Message-Id: <200712242148.lBOLmMgo030799@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 131544 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 24 Dec 2007 21:48:23 -0000

http://perforce.freebsd.org/chv.cgi?CH=131544

Change 131544 by rwatson@rwatson_cinnamon on 2007/12/24 21:47:57

	Fix ifdefs and some signs.

Affected files ...

.. //depot/projects/zcopybpf/src/contrib/libpcap/pcap-bpf.c#16 edit

Differences ...

==== //depot/projects/zcopybpf/src/contrib/libpcap/pcap-bpf.c#16 (text+ko) ====

@@ -39,9 +39,7 @@
 #include <sys/ioctl.h>
 #include <sys/utsname.h>
 
-#ifdef BIOCGETBUFMODE
 #include <machine/atomic.h>
-#endif
 
 #include <net/if.h>
 
@@ -154,7 +152,7 @@
  * and set up p->buffer and cc to reflect one if available.
  */
 static int
-pcap_next_zbuf_shm(pcap_t *p, u_int *cc)
+pcap_next_zbuf_shm(pcap_t *p, int *cc)
 {
 	struct bpf_zbuf_header *bzh;
 
@@ -194,7 +192,7 @@
  * work.
  */
 static int
-pcap_next_zbuf(pcap_t *p, u_int *cc)
+pcap_next_zbuf(pcap_t *p, int *cc)
 {
 	struct bpf_zbuf bz;
 	struct timeval tv;