aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2013-07-05 16:50:27 +0100
committerPeter Maydell <peter.maydell@linaro.org>2013-07-05 16:55:22 +0100
commitbc7b4f7cdc5efaa88ac65e7ededa5b4cca1c10c1 (patch)
treed9b017760111ca677e7541237a66d471a4b91e99
parent9d1efe9c9b6b537109edcbca054cae20c808b230 (diff)
downloadqemu-arm-bc7b4f7cdc5efaa88ac65e7ededa5b4cca1c10c1.tar.gz
linux-user: Move includes of target-specific headers to end of qemu.h
The target-specific headers (target_cpu.h and target_signal.h) might need to use the target-independent structure and function definitions of qemu.h; so include them only at the bottom of qemu.h, not the top. Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
-rw-r--r--linux-user/qemu.h9
1 files changed, 7 insertions, 2 deletions
diff --git a/linux-user/qemu.h b/linux-user/qemu.h
index 20d171c8aa..b64f1528ed 100644
--- a/linux-user/qemu.h
+++ b/linux-user/qemu.h
@@ -16,8 +16,6 @@
#include "exec/user/thunk.h"
#include "syscall_defs.h"
#include "syscall.h"
-#include "target_cpu.h"
-#include "target_signal.h"
#include "exec/gdbstub.h"
#include "qemu/queue.h"
@@ -454,4 +452,11 @@ static inline void *lock_user_string(abi_ulong guest_addr)
#include <pthread.h>
#endif
+/* Include target-specific struct and function definitions;
+ * they may need access to the target-independent structures
+ * above, so include them last.
+ */
+#include "target_cpu.h"
+#include "target_signal.h"
+
#endif /* QEMU_H */