aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2015-12-04 17:34:20 +0000
committerMichael Tokarev <mjt@tls.msk.ru>2016-01-11 11:39:28 +0300
commit529490e5d664a20d5c4223070dd7c03a0e02b6bd (patch)
tree7c9b050c92b83748825cf7f690e0c0761ca19a6b
parent8f32510f1ca72332b9a662579e951f67d636142e (diff)
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 <peter.maydell@linaro.org> Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
-rw-r--r--include/qemu-common.h1
-rw-r--r--include/qemu/osdep.h2
2 files changed, 2 insertions, 1 deletions
diff --git a/include/qemu-common.h b/include/qemu-common.h
index 405364f2b9..22b010c7d7 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 84e84ac700..59a7f8deca 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