From: Peter Maydell Date: Fri, 4 Dec 2015 17:34:20 +0000 (+0000) Subject: osdep.h: Include glib-compat.h in osdep.h rather than qemu-common.h X-Git-Tag: v2.6.0-rc0~233^2~4 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=529490e5d664a20d5c4223070dd7c03a0e02b6bd;p=thirdparty%2Fqemu.git osdep.h: Include glib-compat.h in osdep.h rather than qemu-common.h Our use of glib is now pervasive across QEMU. Move the include of glib-compat.h from qemu-common.h to osdep.h so that it is more widely accessible and doesn't get forgotten by accident. (Failure to include it will result in build failure on old versions of glib which is likely to be unnoticed by most developers.) Signed-off-by: Peter Maydell Signed-off-by: Michael Tokarev --- diff --git a/include/qemu-common.h b/include/qemu-common.h index 405364f2b93..22b010c7d79 100644 --- a/include/qemu-common.h +++ b/include/qemu-common.h @@ -22,7 +22,6 @@ #define TFR(expr) do { if ((expr) != -1) break; } while (errno == EINTR) -#include "glib-compat.h" #include "qemu/option.h" #include "qemu/host-utils.h" diff --git a/include/qemu/osdep.h b/include/qemu/osdep.h index 84e84ac700c..59a7f8deca6 100644 --- a/include/qemu/osdep.h +++ b/include/qemu/osdep.h @@ -69,6 +69,8 @@ #include "sysemu/os-posix.h" #endif +#include "glib-compat.h" + #include "qapi/error.h" #if defined(CONFIG_SOLARIS) && CONFIG_SOLARIS_VERSION < 10