2013-11-25 17:36:46 +01:00
|
|
|
Subject: [PATCH] Change include order to avoid conflict with system header
|
|
|
|
|
From: Andreas Schwab <schwab@suse.de>
|
|
|
|
|
|
|
|
|
|
R_SP is also defined in <sys/ucontext.h> on m68k.
|
|
|
|
|
Also remove duplicate definitions.
|
|
|
|
|
|
|
|
|
|
Signed-off-by: Andreas Schwab <schwab@suse.de>
|
|
|
|
|
|
|
|
|
|
Index: xorg-server-1.14.3/hw/xfree86/int10/xf86x86emu.c
|
|
|
|
|
===================================================================
|
|
|
|
|
--- xorg-server-1.14.3.orig/hw/xfree86/int10/xf86x86emu.c
|
|
|
|
|
+++ xorg-server-1.14.3/hw/xfree86/int10/xf86x86emu.c
|
|
|
|
|
@@ -7,7 +7,6 @@
|
|
|
|
|
#include <xorg-config.h>
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
-#include <x86emu.h>
|
|
|
|
|
#include "xf86.h"
|
|
|
|
|
#include "xf86_OSproc.h"
|
2014-05-13 15:54:02 +02:00
|
|
|
#include "xf86Pci.h"
|
2013-11-25 17:36:46 +01:00
|
|
|
@@ -15,6 +14,7 @@
|
|
|
|
|
#define _INT10_PRIVATE
|
|
|
|
|
#include "xf86int10.h"
|
|
|
|
|
#include "int10Defines.h"
|
|
|
|
|
+#include <x86emu.h>
|
|
|
|
|
|
|
|
|
|
#define M _X86EMU_env
|
|
|
|
|
|
|
|
|
|
Index: xorg-server-1.14.3/hw/xfree86/x86emu/x86emu/regs.h
|
|
|
|
|
===================================================================
|
|
|
|
|
--- xorg-server-1.14.3.orig/hw/xfree86/x86emu/x86emu/regs.h
|
|
|
|
|
+++ xorg-server-1.14.3/hw/xfree86/x86emu/x86emu/regs.h
|
|
|
|
|
@@ -147,14 +147,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
|
