From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1L8ers-0001vO-DG
	for qemu-devel@nongnu.org; Fri, 05 Dec 2008 12:53:32 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1L8err-0001vC-QU
	for qemu-devel@nongnu.org; Fri, 05 Dec 2008 12:53:31 -0500
Received: from [199.232.76.173] (port=37064 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1L8err-0001v9-O4
	for qemu-devel@nongnu.org; Fri, 05 Dec 2008 12:53:31 -0500
Received: from savannah.gnu.org ([199.232.41.3]:39579 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 1L8erp-0001H5-Oh
	for qemu-devel@nongnu.org; Fri, 05 Dec 2008 12:53:31 -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 1L8eri-0007Aw-FV
	for qemu-devel@nongnu.org; Fri, 05 Dec 2008 17:53:22 +0000
Received: from blueswir1 by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <blueswir1@savannah.gnu.org>) id 1L8eri-0007As-5D
	for qemu-devel@nongnu.org; Fri, 05 Dec 2008 17:53:22 +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: <E1L8eri-0007As-5D@cvs.savannah.gnu.org>
Date: Fri, 05 Dec 2008 17:53:22 +0000
Subject: [Qemu-devel] [5885] sys-queue.h defines _SYS_QUEUE_H_ which is also
	defined by
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: 5885
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=5885
Author:   blueswir1
Date:     2008-12-05 17:53:21 +0000 (Fri, 05 Dec 2008)

Log Message:
-----------
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>

Modified Paths:
--------------
    trunk/block.c

Modified: trunk/block.c
===================================================================
--- trunk/block.c	2008-12-05 16:05:41 UTC (rev 5884)
+++ trunk/block.c	2008-12-05 17:53:21 UTC (rev 5885)
@@ -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