Author: emaste
Date: Thu Jun 28 20:10:43 2012
New Revision: 237729
URL: http://svn.freebsd.org/changeset/base/237729
Log:
Fix ioctl type for compiling with clang
Modified:
head/tools/tools/netmap/bridge.c
head/tools/tools/netmap/pcap.c
Modified: head/tools/tools/netmap/bridge.c
==============================================================================
--- head/tools/tools/netmap/bridge.c Thu Jun 28 19:55:46 2012
(r237728)
+++ head/tools/tools/netmap/bridge.c Thu Jun 28 20:10:43 2012
(r237729)
@@ -79,7 +79,7 @@ sigint_h(__unused int sig)
static int
-do_ioctl(struct my_ring *me, int what)
+do_ioctl(struct my_ring *me, unsigned long what)
{
struct ifreq ifr;
int error;
@@ -98,7 +98,7 @@ do_ioctl(struct my_ring *me, int what)
}
error = ioctl(me->fd, what, &ifr);
if (error) {
- D("ioctl error %d", what);
+ D("ioctl error 0x%lx", what);
return error;
}
switch (what) {
Modified: head/tools/tools/netmap/pcap.c
==============================================================================
--- head/tools/tools/netmap/pcap.c Thu Jun 28 19:55:46 2012
(r237728)
+++ head/tools/tools/netmap/pcap.c Thu Jun 28 20:10:43 2012
(r237729)
@@ -201,7 +201,7 @@ struct my_ring {
static int
-do_ioctl(struct my_ring *me, int what)
+do_ioctl(struct my_ring *me, unsigned long what)
{
struct ifreq ifr;
int error;
@@ -221,7 +221,7 @@ do_ioctl(struct my_ring *me, int what)
}
error = ioctl(me->fd, what, &ifr);
if (error) {
- D("ioctl 0x%x error %d", what, error);
+ D("ioctl 0x%lx error %d", what, error);
return error;
}
switch (what) {
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
