qobject: Clean up includes

pm215 · pm215 · commit f2ad72b30e21 · 2016-02-04T17:41:30.000Z
Clean up includes so that osdep.h is included first and headers
which it implies are not included manually.

This commit was created with scripts/clean-includes.

Signed-off-by: Peter Maydell &lt;peter.maydell@linaro.org&gt;
Reviewed-by: Eric Blake &lt;eblake@redhat.com&gt;
Message-id: 1454089805-5470-12-git-send-email-peter.maydell@linaro.org
diff --git a/qobject/json-lexer.c b/qobject/json-lexer.c
@@ -11,9 +11,9 @@
  *
  */
 
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "qapi/qmp/json-lexer.h"
-#include <stdint.h>
 
 #define MAX_TOKEN_SIZE (64ULL << 20)
 
diff --git a/qobject/json-parser.c b/qobject/json-parser.c
@@ -11,7 +11,7 @@
  *
  */
 
-#include <stdarg.h>
+#include "qemu/osdep.h"
 
 #include "qemu-common.h"
 #include "qapi/qmp/qstring.h"
diff --git a/qobject/json-streamer.c b/qobject/json-streamer.c
@@ -11,6 +11,7 @@
  *
  */
 
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "qapi/qmp/json-lexer.h"
 #include "qapi/qmp/json-streamer.h"
diff --git a/qobject/qbool.c b/qobject/qbool.c
@@ -11,6 +11,7 @@
  *
  */
 
+#include "qemu/osdep.h"
 #include "qapi/qmp/qbool.h"
 #include "qapi/qmp/qobject.h"
 #include "qemu-common.h"
diff --git a/qobject/qdict.c b/qobject/qdict.c
@@ -10,6 +10,7 @@
  * See the COPYING.LIB file in the top-level directory.
  */
 
+#include "qemu/osdep.h"
 #include "qapi/qmp/qint.h"
 #include "qapi/qmp/qfloat.h"
 #include "qapi/qmp/qdict.h"
diff --git a/qobject/qfloat.c b/qobject/qfloat.c
@@ -11,6 +11,7 @@
  *
  */
 
+#include "qemu/osdep.h"
 #include "qapi/qmp/qfloat.h"
 #include "qapi/qmp/qobject.h"
 #include "qemu-common.h"
diff --git a/qobject/qint.c b/qobject/qint.c
@@ -10,6 +10,7 @@
  * See the COPYING.LIB file in the top-level directory.
  */
 
+#include "qemu/osdep.h"
 #include "qapi/qmp/qint.h"
 #include "qapi/qmp/qobject.h"
 #include "qemu-common.h"
diff --git a/qobject/qjson.c b/qobject/qjson.c
@@ -11,6 +11,7 @@
  *
  */
 
+#include "qemu/osdep.h"
 #include "qapi/qmp/json-lexer.h"
 #include "qapi/qmp/json-parser.h"
 #include "qapi/qmp/json-streamer.h"
diff --git a/qobject/qlist.c b/qobject/qlist.c
@@ -10,6 +10,7 @@
  * See the COPYING.LIB file in the top-level directory.
  */
 
+#include "qemu/osdep.h"
 #include "qapi/qmp/qlist.h"
 #include "qapi/qmp/qobject.h"
 #include "qemu/queue.h"
diff --git a/qobject/qnull.c b/qobject/qnull.c
@@ -10,6 +10,7 @@
  * or later.  See the COPYING.LIB file in the top-level directory.
  */
 
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "qapi/qmp/qobject.h"
 
diff --git a/qobject/qobject.c b/qobject/qobject.c
@@ -7,6 +7,7 @@
  * or later.  See the COPYING.LIB file in the top-level directory.
  */
 
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "qapi/qmp/qbool.h"
 #include "qapi/qmp/qdict.h"
diff --git a/qobject/qstring.c b/qobject/qstring.c
@@ -10,6 +10,7 @@
  * See the COPYING.LIB file in the top-level directory.
  */
 
+#include "qemu/osdep.h"
 #include "qapi/qmp/qobject.h"
 #include "qapi/qmp/qstring.h"
 #include "qemu-common.h"

Original file line number	Diff line number	Diff line change
`@@ -11,9 +11,9 @@`
`11`	`11`	`*`
`12`	`12`	`*/`
`13`	`13`
	`14`	`+#include "qemu/osdep.h"`
`14`	`15`	`#include "qemu-common.h"`
`15`	`16`	`#include "qapi/qmp/json-lexer.h"`
`16`		`-#include <stdint.h>`
`17`	`17`
`18`	`18`	`#define MAX_TOKEN_SIZE (64ULL << 20)`
`19`	`19`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`*`
`12`	`12`	`*/`
`13`	`13`
`14`		`-#include <stdarg.h>`
	`14`	`+#include "qemu/osdep.h"`
`15`	`15`
`16`	`16`	`#include "qemu-common.h"`
`17`	`17`	`#include "qapi/qmp/qstring.h"`
Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@`
`11`	`11`	`*`
`12`	`12`	`*/`
`13`	`13`
	`14`	`+#include "qemu/osdep.h"`
`14`	`15`	`#include "qemu-common.h"`
`15`	`16`	`#include "qapi/qmp/json-lexer.h"`
`16`	`17`	`#include "qapi/qmp/json-streamer.h"`