[Qemu-devel] [5885] sys-queue.h defines _SYS_QUEUE_H_ which is also defined by

[Blue Swirl]

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 <address@hidden>

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