[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-trivial] [PULL 15/19] osdep.h: Include glib-compat.h in osdep.h ra
From: |
Michael Tokarev |
Subject: |
[Qemu-trivial] [PULL 15/19] osdep.h: Include glib-compat.h in osdep.h rather than qemu-common.h |
Date: |
Mon, 11 Jan 2016 11:41:54 +0300 |
From: Peter Maydell <address@hidden>
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 <address@hidden>
Signed-off-by: Michael Tokarev <address@hidden>
---
include/qemu-common.h | 1 -
include/qemu/osdep.h | 2 ++
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/include/qemu-common.h b/include/qemu-common.h
index 405364f..22b010c 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 84e84ac..59a7f8d 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
--
2.1.4
- [Qemu-trivial] [PULL 00/19] Trivial patches for 2016-01-11, Michael Tokarev, 2016/01/11
- [Qemu-trivial] [PULL 07/19] xen/Makefile.objs: simplify, Michael Tokarev, 2016/01/11
- [Qemu-trivial] [PULL 06/19] crypto: Fix typo in example, Michael Tokarev, 2016/01/11
- [Qemu-trivial] [PULL 01/19] unicore32: convert get_sp_from_cpustate from macro to inline, Michael Tokarev, 2016/01/11
- [Qemu-trivial] [PULL 08/19] configure: fix trace backend check, Michael Tokarev, 2016/01/11
- [Qemu-trivial] [PULL 05/19] MAINTAINERS: Add the correct device_tree.h file, Michael Tokarev, 2016/01/11
- [Qemu-trivial] [PULL 14/19] scripts/checkpatch.pl: Don't allow special cases of unspaced operators, Michael Tokarev, 2016/01/11
- [Qemu-trivial] [PULL 09/19] hw/misc/edu: Convert to realize(), Michael Tokarev, 2016/01/11
- [Qemu-trivial] [PULL 04/19] iscsi: fix readcapacity error message, Michael Tokarev, 2016/01/11
- [Qemu-trivial] [PULL 15/19] osdep.h: Include glib-compat.h in osdep.h rather than qemu-common.h,
Michael Tokarev <=
- [Qemu-trivial] [PULL 13/19] PCI Bonito: QOMify and cleanup, Michael Tokarev, 2016/01/11
- [Qemu-trivial] [PULL 16/19] hw/ide: Remove superfluous return statements, Michael Tokarev, 2016/01/11
- [Qemu-trivial] [PULL 19/19] hw/s390x: Remove superfluous return statements, Michael Tokarev, 2016/01/11
- [Qemu-trivial] [PULL 18/19] hw/core/qdev: Remove superfluous return statement, Michael Tokarev, 2016/01/11
- [Qemu-trivial] [PULL 17/19] hw/acpi: Remove superfluous return statement, Michael Tokarev, 2016/01/11
- [Qemu-trivial] [PULL 10/19] Add missing syscall nrs. according to more recent Linux kernels, Michael Tokarev, 2016/01/11
- [Qemu-trivial] [PULL 11/19] gt64120: convert to realize(), Michael Tokarev, 2016/01/11
- [Qemu-trivial] [PULL 03/19] net: convert qemu_log to error_report, fix message, Michael Tokarev, 2016/01/11
- [Qemu-trivial] [PULL 02/19] linux-user: enable sigaltstack for all architectures, Michael Tokarev, 2016/01/11
- [Qemu-trivial] [PULL 12/19] SH PCI Host: convert to realize(), Michael Tokarev, 2016/01/11