From 11165820d194478d493d667a11ea8480ce893c70 Mon Sep 17 00:00:00 2001
From: Paul Brook <paul@codesourcery.com>
Date: Sun, 13 Jun 2010 19:00:50 +0100
Subject: [PATCH] Move stdbool.h

Move inclusion of stdbool.h to common header files, instead of including
in an ad-hoc manner.

Signed-off-by: Paul Brook <paul@codesourcery.com>
---
 block/blkdebug.c     | 2 --
 check-qjson.c        | 1 -
 dyngen-exec.h        | 1 +
 hw/9p.h              | 2 --
 hw/eepro100.c        | 1 -
 hw/hw.h              | 1 -
 hw/virtio-serial.h   | 1 -
 hw/xenfb.c           | 1 -
 json-parser.c        | 1 -
 kvm.h                | 1 -
 nbd.h                | 1 -
 net.h                | 1 -
 qemu-common.h        | 1 +
 vnc-encoding-tight.c | 2 --
 14 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/block/blkdebug.c b/block/blkdebug.c
index 8325f75f80..98fed944b1 100644
--- a/block/blkdebug.c
+++ b/block/blkdebug.c
@@ -26,8 +26,6 @@
 #include "block_int.h"
 #include "module.h"
 
-#include <stdbool.h>
-
 typedef struct BlkdebugVars {
     int state;
 
diff --git a/check-qjson.c b/check-qjson.c
index 109e77753e..86e780ccde 100644
--- a/check-qjson.c
+++ b/check-qjson.c
@@ -9,7 +9,6 @@
  *
  */
 #include <check.h>
-#include <stdbool.h>
 
 #include "qstring.h"
 #include "qint.h"
diff --git a/dyngen-exec.h b/dyngen-exec.h
index 0700a2d9bb..5bfef3f6fe 100644
--- a/dyngen-exec.h
+++ b/dyngen-exec.h
@@ -31,6 +31,7 @@
    host headers do not allow that. */
 #include <stddef.h>
 #include <stdint.h>
+#include <stdbool.h>
 
 #ifdef __OpenBSD__
 #include <sys/types.h>
diff --git a/hw/9p.h b/hw/9p.h
index 5fdd770ffc..d9951d6bcc 100644
--- a/hw/9p.h
+++ b/hw/9p.h
@@ -14,8 +14,6 @@
 #ifndef QEMU_9P_H
 #define QEMU_9P_H
 
-#include <stdbool.h>
-
 typedef struct V9fsConf
 {
     /* tag name for the device */
diff --git a/hw/eepro100.c b/hw/eepro100.c
index a74d834811..97afa2cd9f 100644
--- a/hw/eepro100.c
+++ b/hw/eepro100.c
@@ -41,7 +41,6 @@
  *      * Wake-on-LAN is not implemented.
  */
 
-#include <stdbool.h>            /* bool */
 #include <stddef.h>             /* offsetof */
 #include "hw.h"
 #include "pci.h"
diff --git a/hw/hw.h b/hw/hw.h
index 36be0beed3..a49d866532 100644
--- a/hw/hw.h
+++ b/hw/hw.h
@@ -8,7 +8,6 @@
 #include "cpu-common.h"
 #endif
 
-#include <stdbool.h>
 #include "ioport.h"
 #include "irq.h"
 
diff --git a/hw/virtio-serial.h b/hw/virtio-serial.h
index a93b5458b2..ff08c40681 100644
--- a/hw/virtio-serial.h
+++ b/hw/virtio-serial.h
@@ -15,7 +15,6 @@
 #ifndef _QEMU_VIRTIO_SERIAL_H
 #define _QEMU_VIRTIO_SERIAL_H
 
-#include <stdbool.h>
 #include "qdev.h"
 #include "virtio.h"
 
diff --git a/hw/xenfb.c b/hw/xenfb.c
index 422cd53400..da5297b498 100644
--- a/hw/xenfb.c
+++ b/hw/xenfb.c
@@ -29,7 +29,6 @@
 #include <sys/types.h>
 #include <fcntl.h>
 #include <unistd.h>
-#include <stdbool.h>
 #include <sys/mman.h>
 #include <errno.h>
 #include <stdio.h>
diff --git a/json-parser.c b/json-parser.c
index b55d76373e..1c88ed898e 100644
--- a/json-parser.c
+++ b/json-parser.c
@@ -11,7 +11,6 @@
  *
  */
 
-#include <stdbool.h>
 #include <stdarg.h>
 
 #include "qemu-common.h"
diff --git a/kvm.h b/kvm.h
index a28e7aab53..a30529c9c4 100644
--- a/kvm.h
+++ b/kvm.h
@@ -14,7 +14,6 @@
 #ifndef QEMU_KVM_H
 #define QEMU_KVM_H
 
-#include <stdbool.h>
 #include <errno.h>
 #include "config-host.h"
 #include "qemu-queue.h"
diff --git a/nbd.h b/nbd.h
index 5deac29152..5a1fbdf512 100644
--- a/nbd.h
+++ b/nbd.h
@@ -20,7 +20,6 @@
 #define NBD_H
 
 #include <sys/types.h>
-#include <stdbool.h>
 
 #include <qemu-common.h>
 #include "block_int.h"
diff --git a/net.h b/net.h
index b83f615346..518cf9c1f7 100644
--- a/net.h
+++ b/net.h
@@ -1,7 +1,6 @@
 #ifndef QEMU_NET_H
 #define QEMU_NET_H
 
-#include <stdbool.h>
 #include "qemu-queue.h"
 #include "qemu-common.h"
 #include "qdict.h"
diff --git a/qemu-common.h b/qemu-common.h
index a4888e5e5c..d133f35f4c 100644
--- a/qemu-common.h
+++ b/qemu-common.h
@@ -26,6 +26,7 @@ typedef struct QEMUBH QEMUBH;
 #include <stdlib.h>
 #include <stdio.h>
 #include <stdarg.h>
+#include <stdbool.h>
 #include <string.h>
 #include <strings.h>
 #include <inttypes.h>
diff --git a/vnc-encoding-tight.c b/vnc-encoding-tight.c
index e8604a85a9..faba4834cd 100644
--- a/vnc-encoding-tight.c
+++ b/vnc-encoding-tight.c
@@ -26,8 +26,6 @@
  * THE SOFTWARE.
  */
 
-#include <stdbool.h>
-
 #include "qdict.h"
 #include "qint.h"
 #include "vnc.h"