Unbreak tap compilation on OS X
PATCH 1/1 Unbreak tap compilation on OS X
Currently compiling the tap sources breaks on Mac OS X. This is because of:
1) tap-linux.h requiring Linux includes
2) typos
3) missing #includes
This patch adds what's necessary to compile tap happily on Mac OS X. I haven't tested if using tap actually works, but I don't think that's a major issue as that code was probably seriously untested before already.
I didn't split the patch, because it's only a few lines of code and splitting is probably not worth the effort here.
Signed-off-by Alexander Graf <[email protected]>
--- net/tap-bsd.c | 6 ++++-- net/tap-linux.h | 4 ++++ net/tap.c | 1 + 3 files changed, 9 insertions(+), 2 deletions(-)
net/tap-bsd.c +4 -2
@@ -23,7 +23,8 @@*/ #include "net/tap.h" -#incude "qemu-common.h" +#include "qemu-common.h" +#include "sysemu.h" #ifdef __NetBSD__#include <net/if_tap.h>
@@ -34,8 +35,9 @@#else #include <util.h> #endif -#elif defined (__GLIBC__) && defined (__FreeBSD_kernel__) +#if defined (__GLIBC__) && defined (__FreeBSD_kernel__)#include <freebsd/stdlib.h> +#endif #if defined(__OpenBSD__)#include <util.h>
net/tap-linux.h +4 -0
@@ -17,6 +17,8 @@#define QEMU_TAP_H #include <stdint.h> +#ifdef __LINUX__ +#include <linux/ioctl.h> /* Ioctl defines */
@@ -26,6 +28,8 @@#define TUNGETIFF _IOR('T', 210, unsigned int)#define TUNSETSNDBUF _IOW('T', 212, int) +#endif +/* TUNSETIFF ifr flags */ #define IFF_TAP 0x0002#define IFF_NO_PI 0x1000
net/tap.c +1 -0
@@ -31,6 +31,7 @@#include <sys/ioctl.h> #include <sys/stat.h> #include <sys/wait.h> +#include <sys/socket.h> #include <net/if.h> #include "net.h"
Signature · 1 line
1.6.0.2