From 3990d09adf4463eca200ad964cc55643c33feb50 Mon Sep 17 00:00:00 2001
From: blueswir1 <blueswir1@c046a42c-6fe2-441c-8c8c-71466251a162>
Date: Fri, 5 Dec 2008 17:53:21 +0000
Subject: sys-queue.h defines _SYS_QUEUE_H_ which is also defined by the
 <sys/queue.h> system header. <sys/disk.h> uses SLIST_ENTRY on NetBSD, which
 doesn't exist in sys-queue.h. Therefore, include <sys/queue.h> before
 including sys-queue.h.

Signed-off-by: Christoph Egger <Christoph.Egger@amd.com>


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@5885 c046a42c-6fe2-441c-8c8c-71466251a162
---
 block.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'block.c')

diff --git a/block.c b/block.c
index dadf3cd..22aec97 100644
--- a/block.c
+++ b/block.c
@@ -21,6 +21,12 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+#include "config-host.h"
+#ifdef _BSD
+/* include native header before sys-queue.h */
+#include <sys/queue.h>
+#endif
+
 #include "qemu-common.h"
 #include "console.h"
 #include "block_int.h"
@@ -29,7 +35,6 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/ioctl.h>
-#include <sys/queue.h>
 #include <sys/disk.h>
 #endif
 
-- 
cgit v1.1