]> git.proxmox.com Git - mirror_qemu.git/commit - util/iova-tree.c
util: remove redundant include of glib.h and add osdep.h
authorDaniel P. Berrangé <berrange@redhat.com>
Wed, 6 Jun 2018 17:15:38 +0000 (18:15 +0100)
committerDaniel P. Berrangé <berrange@redhat.com>
Fri, 29 Jun 2018 11:22:28 +0000 (12:22 +0100)
commitc5f1d0c493f29f0137fbd79a2c6653f8546f2044
tree45695a9cebd20d3085243ce5760d567b71a392db
parent609ef9f451759151d0bfe7c3843410ab94d68f18
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>
include/qemu/iova-tree.h
util/iova-tree.c