diff options
| author | Blue Swirl <blauwirbel@gmail.com> | 2009-09-12 12:36:11 +0000 |
|---|---|---|
| committer | Blue Swirl <blauwirbel@gmail.com> | 2009-09-12 12:36:11 +0000 |
| commit | aba1d00a41d5aff5fc78bf924627b89a298a5a5a (patch) | |
| tree | 7b415dfff2b0769c763d94d9def98ed460dd7df4 | |
| parent | a2a45a26c94e5b3feacb24b8e63c56a7132122fc (diff) | |
| download | qemu-aba1d00a41d5aff5fc78bf924627b89a298a5a5a.tar.gz qemu-aba1d00a41d5aff5fc78bf924627b89a298a5a5a.tar.bz2 qemu-aba1d00a41d5aff5fc78bf924627b89a298a5a5a.zip | |
Work around OpenSolaris sys/regset.h namespace pollution
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
| -rw-r--r-- | ppc-dis.c | 1 | ||||
| -rw-r--r-- | target-i386/exec.h | 9 |
2 files changed, 10 insertions, 0 deletions
@@ -572,6 +572,7 @@ const struct powerpc_operand powerpc_operands[] = /* The DS field in a DS form instruction. This is like D, but the lower two bits are forced to zero. */ +#undef DS #define DS DQ + 1 { 0xfffc, 0, NULL, NULL, PPC_OPERAND_PARENS | PPC_OPERAND_SIGNED | PPC_OPERAND_DS }, diff --git a/target-i386/exec.h b/target-i386/exec.h index c59c4e872b..864d030986 100644 --- a/target-i386/exec.h +++ b/target-i386/exec.h @@ -33,14 +33,23 @@ register struct CPUX86State *env asm(AREG0); #include "qemu-common.h" #include "qemu-log.h" +#undef EAX #define EAX (env->regs[R_EAX]) +#undef ECX #define ECX (env->regs[R_ECX]) +#undef EDX #define EDX (env->regs[R_EDX]) +#undef EBX #define EBX (env->regs[R_EBX]) +#undef ESP #define ESP (env->regs[R_ESP]) +#undef EBP #define EBP (env->regs[R_EBP]) +#undef ESI #define ESI (env->regs[R_ESI]) +#undef EDI #define EDI (env->regs[R_EDI]) +#undef EIP #define EIP (env->eip) #define DF (env->df) |