diff options
| author | Alexander Graf <agraf@suse.de> | 2009-10-30 22:27:00 +0100 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2009-10-30 16:38:15 -0500 |
| commit | 71f4effce79ec0485586963ea764f2c212c72f26 (patch) | |
| tree | 58890ab7f368bb8b673e08f97f0ceebd32ce404f | |
| parent | 195325a4c10cc4b9d678e76b99b4f74b7223adf2 (diff) | |
| download | focaccia-qemu-71f4effce79ec0485586963ea764f2c212c72f26.tar.gz focaccia-qemu-71f4effce79ec0485586963ea764f2c212c72f26.zip | |
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 <agraf@suse.de> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
| -rw-r--r-- | net/tap-bsd.c | 6 | ||||
| -rw-r--r-- | net/tap-linux.h | 4 | ||||
| -rw-r--r-- | net/tap.c | 1 |
3 files changed, 9 insertions, 2 deletions
diff --git a/net/tap-bsd.c b/net/tap-bsd.c index 3ad14bb2c8..ac84383f0f 100644 --- a/net/tap-bsd.c +++ b/net/tap-bsd.c @@ -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> diff --git a/net/tap-linux.h b/net/tap-linux.h index d81c65081f..f1a0fce176 100644 --- a/net/tap-linux.h +++ b/net/tap-linux.h @@ -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 diff --git a/net/tap.c b/net/tap.c index 60354e47a9..bdb4a15c2a 100644 --- a/net/tap.c +++ b/net/tap.c @@ -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" |