summaryrefslogtreecommitdiff
path: root/target-i386
diff options
context:
space:
mode:
authorBlue Swirl <blauwirbel@gmail.com>2009-09-12 12:36:11 +0000
committerBlue Swirl <blauwirbel@gmail.com>2009-09-12 12:36:11 +0000
commit43c659fe685fdd0744dd6832614679725fe18163 (patch)
tree7b415dfff2b0769c763d94d9def98ed460dd7df4 /target-i386
parent04eea95f721a6b5dd16c9ccb6f7dff695aafe4de (diff)
downloadqemu-43c659fe685fdd0744dd6832614679725fe18163.tar.gz
qemu-43c659fe685fdd0744dd6832614679725fe18163.tar.bz2
qemu-43c659fe685fdd0744dd6832614679725fe18163.zip
Work around OpenSolaris sys/regset.h namespace pollution
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
Diffstat (limited to 'target-i386')
-rw-r--r--target-i386/exec.h9
1 files changed, 9 insertions, 0 deletions
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)