From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1KyUci-0000zC-I1
	for qemu-devel@nongnu.org; Fri, 07 Nov 2008 11:55:52 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1KyUch-0000xQ-17
	for qemu-devel@nongnu.org; Fri, 07 Nov 2008 11:55:51 -0500
Received: from [199.232.76.173] (port=56494 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1KyUcg-0000x0-H8
	for qemu-devel@nongnu.org; Fri, 07 Nov 2008 11:55:50 -0500
Received: from savannah.gnu.org ([199.232.41.3]:55771 helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <INVALID.NOREPLY@gnu.org>)
	id 1KyUcg-0005ZN-7U
	for qemu-devel@nongnu.org; Fri, 07 Nov 2008 11:55:50 -0500
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1KyUcf-0008Rx-Ej
	for qemu-devel@nongnu.org; Fri, 07 Nov 2008 16:55:49 +0000
Received: from blueswir1 by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <blueswir1@savannah.gnu.org>) id 1KyUcf-0008Rt-6Q
	for qemu-devel@nongnu.org; Fri, 07 Nov 2008 16:55:49 +0000
MIME-Version: 1.0
Errors-To: blueswir1
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
From: Blue Swirl <blauwirbel@gmail.com>
Message-Id: <E1KyUcf-0008Rt-6Q@cvs.savannah.gnu.org>
Date: Fri, 07 Nov 2008 16:55:49 +0000
Subject: [Qemu-devel] [5646] Fix some build issues for BSD.
Reply-To: qemu-devel@nongnu.org
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: qemu-devel@nongnu.org

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 <Christoph.Egger@amd.com>

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>