Commit c5f1d0c4 authored Jun 06, 2018 by Daniel P. Berrangé

util: remove redundant include of glib.h and add osdep.h



Code must only ever include glib.h indirectly via the glib-compat.h
header file, because we will need some macros set before glib.h is
pulled in. Adding extra includes of glib.h will (soon) cause compile
failures such as:

In file included from /home/berrange/src/virt/qemu/include/qemu/osdep.h:107,
                 from /home/berrange/src/virt/qemu/include/qemu/iova-tree.h:26,
                 from util/iova-tree.c:13:
/home/berrange/src/virt/qemu/include/glib-compat.h:22: error: "GLIB_VERSION_MIN_REQUIRED" redefined [-Werror]
 #define GLIB_VERSION_MIN_REQUIRED GLIB_VERSION_2_40

In file included from /usr/include/glib-2.0/glib/gtypes.h:34,
                 from /usr/include/glib-2.0/glib/galloca.h:32,
                 from /usr/include/glib-2.0/glib.h:30,
                 from util/iova-tree.c:12:
/usr/include/glib-2.0/glib/gversionmacros.h:237: note: this is the location of the previous definition
 # define GLIB_VERSION_MIN_REQUIRED      (GLIB_VERSION_CUR_STABLE)

Furthermore, the osdep.h include should always be done directly from the
.c file rather than indirectly via any .h file.

Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>

parent 609ef9f4

include/qemu/iova-tree.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -23,7 +23,6 @@
		* for the thread safety issue.
		*/

		#include "qemu/osdep.h"
		#include "exec/memory.h"
		#include "exec/hwaddr.h"

util/iova-tree.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -9,7 +9,7 @@
		* This work is licensed under the terms of the GNU GPL, version 2 or later.
		*/

		#include <glib.h>
		#include "qemu/osdep.h"
		#include "qemu/iova-tree.h"

		struct IOVATree {