[Qemu-devel] [5646] Fix some build issues for BSD.

[Blue Swirl]

Revision: 5646
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=5646
Author:   blueswir1
Date:     2008-11-07 16:55:48 +0000 (Fri, 07 Nov 2008)

Log Message:
-----------
Fix some build issues for BSD.

Signed-off-by: Christoph Egger <address@hidden>

Modified Paths:
--------------
    trunk/net.c
    trunk/qemu-char.c
    trunk/vl.c

Modified: trunk/net.c
===================================================================
--- trunk/net.c 2008-11-07 14:00:24 UTC (rev 5645)
+++ trunk/net.c 2008-11-07 16:55:48 UTC (rev 5646)
@@ -54,26 +54,31 @@
 #include <termios.h>
 #include <sys/mman.h>
 #include <sys/ioctl.h>
+#include <sys/resource.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
+#include <net/if.h>
+#ifdef __NetBSD__
+#include <net/if_tap.h>
+#endif
+#ifdef __linux__
+#include <linux/if_tun.h>
+#endif
+#include <arpa/inet.h>
 #include <dirent.h>
 #include <netdb.h>
 #include <sys/select.h>
-#include <arpa/inet.h>
 #ifdef _BSD
 #include <sys/stat.h>
-#if !defined(__APPLE__) && !defined(__OpenBSD__)
+#ifdef __FreeBSD__
 #include <libutil.h>
+#else
+#include <util.h>
 #endif
-#ifdef __OpenBSD__
-#include <net/if.h>
-#endif
 #elif defined (__GLIBC__) && defined (__FreeBSD_kernel__)
 #include <freebsd/stdlib.h>
 #else
 #ifdef __linux__
-#include <linux/if.h>
-#include <linux/if_tun.h>
 #include <pty.h>
 #include <malloc.h>
 #include <linux/rtc.h>

Modified: trunk/qemu-char.c
===================================================================
--- trunk/qemu-char.c   2008-11-07 14:00:24 UTC (rev 5645)
+++ trunk/qemu-char.c   2008-11-07 16:55:48 UTC (rev 5646)
@@ -45,25 +45,31 @@
 #include <termios.h>
 #include <sys/mman.h>
 #include <sys/ioctl.h>
+#include <sys/resource.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
+#include <net/if.h>
+#ifdef __NetBSD__
+#include <net/if_tap.h>
+#endif
+#ifdef __linux__
+#include <linux/if_tun.h>
+#endif
+#include <arpa/inet.h>
 #include <dirent.h>
 #include <netdb.h>
 #include <sys/select.h>
-#include <arpa/inet.h>
 #ifdef _BSD
 #include <sys/stat.h>
-#if !defined(__APPLE__) && !defined(__OpenBSD__)
+#ifdef __FreeBSD__
 #include <libutil.h>
+#else
+#include <util.h>
 #endif
-#ifdef __OpenBSD__
-#include <net/if.h>
-#endif
 #elif defined (__GLIBC__) && defined (__FreeBSD_kernel__)
 #include <freebsd/stdlib.h>
 #else
 #ifdef __linux__
-#include <linux/if.h>
 #include <pty.h>
 
 #include <linux/ppdev.h>

Modified: trunk/vl.c
===================================================================
--- trunk/vl.c  2008-11-07 14:00:24 UTC (rev 5645)
+++ trunk/vl.c  2008-11-07 16:55:48 UTC (rev 5646)
@@ -55,26 +55,31 @@
 #include <termios.h>
 #include <sys/mman.h>
 #include <sys/ioctl.h>
+#include <sys/resource.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
+#include <net/if.h>
+#if defined(__NetBSD__)
+#include <net/if_tap.h>
+#endif
+#ifdef __linux__
+#include <linux/if_tun.h>
+#endif
+#include <arpa/inet.h>
 #include <dirent.h>
 #include <netdb.h>
 #include <sys/select.h>
-#include <arpa/inet.h>
 #ifdef _BSD
 #include <sys/stat.h>
-#if !defined(__APPLE__) && !defined(__OpenBSD__)
+#ifdef __FreeBSD__
 #include <libutil.h>
+#else
+#include <util.h>
 #endif
-#ifdef __OpenBSD__
-#include <net/if.h>
-#endif
 #elif defined (__GLIBC__) && defined (__FreeBSD_kernel__)
 #include <freebsd/stdlib.h>
 #else
 #ifdef __linux__
-#include <linux/if.h>
-#include <linux/if_tun.h>
 #include <pty.h>
 #include <malloc.h>
 #include <linux/rtc.h>