From dfeab06c98f7bc37f8ad8a6a2f8f677e5a57a55d Mon Sep 17 00:00:00 2001 From: Peter Maydell Date: Tue, 16 Jul 2013 18:44:52 +0100 Subject: [PATCH] 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 Reviewed-by: Richard Henderson Signed-off-by: Riku Voipio --- linux-user/qemu.h | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/linux-user/qemu.h b/linux-user/qemu.h index 6569608b64..8c420da5c7 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 #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 */