diff options
| author | Andreas Schwab <schwab@suse.de> | 2016-04-28 14:47:33 +0200 |
|---|---|---|
| committer | Adam Jackson <ajax@redhat.com> | 2016-04-29 11:05:38 -0400 |
| commit | 23dfa017298ceceac818f83779858e490c7757b6 (patch) | |
| tree | c205b3f5410e3564964f1e0a4a171118936a2f77 | |
| parent | aa4e757130010dd3202f10ec6cb0c306c1dbcfbc (diff) | |
x86emu: Change include order to avoid conflict with system header
R_SP is also defined in <sys/ucontext.h> on m68k. Also remove duplicate
definitions.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Andreas Schwab <schwab@suse.de>
| -rw-r--r-- | hw/xfree86/int10/xf86x86emu.c | 2 | ||||
| -rw-r--r-- | hw/xfree86/x86emu/x86emu/regs.h | 8 |
2 files changed, 1 insertions, 9 deletions
diff --git a/hw/xfree86/int10/xf86x86emu.c b/hw/xfree86/int10/xf86x86emu.c index 4b0a13090..1dc695d2c 100644 --- a/hw/xfree86/int10/xf86x86emu.c +++ b/hw/xfree86/int10/xf86x86emu.c @@ -7,13 +7,13 @@ #include <xorg-config.h> #endif -#include <x86emu.h> #include "xf86.h" #include "xf86_OSproc.h" #include "xf86Pci.h" #define _INT10_PRIVATE #include "xf86int10.h" #include "int10Defines.h" +#include <x86emu.h> #define M _X86EMU_env diff --git a/hw/xfree86/x86emu/x86emu/regs.h b/hw/xfree86/x86emu/x86emu/regs.h index c040259fa..3c9469f52 100644 --- a/hw/xfree86/x86emu/x86emu/regs.h +++ b/hw/xfree86/x86emu/x86emu/regs.h @@ -158,14 +158,6 @@ struct i386_segment_regs { #define R_FLG spc.FLAGS /* special registers */ -#define R_SP spc.SP.I16_reg.x_reg -#define R_BP spc.BP.I16_reg.x_reg -#define R_SI spc.SI.I16_reg.x_reg -#define R_DI spc.DI.I16_reg.x_reg -#define R_IP spc.IP.I16_reg.x_reg -#define R_FLG spc.FLAGS - -/* special registers */ #define R_ESP spc.SP.I32_reg.e_reg #define R_EBP spc.BP.I32_reg.e_reg #define R_ESI spc.SI.I32_reg.e_reg |