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>

diff --git a/include/qemu-common.h b/include/qemu-common.h
index 405364f2b93a31143acb4631a26f9fe029179af8..22b010c7d79736f3a4a49278941940873adacfbf 100644 (file)
--- 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 84e84ac700c2f8aadf180b9ab6bf00a571136eec..59a7f8deca60b24cd5e14a314f792049a145db4e 100644 (file)
--- 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