PERFORCE change 131544 for review

[Robert Watson]

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

Change 131544 by rwatson at 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;