forked from pool/xorg-x11-server
Egbert Eich
7286d85738
* N_0001-Check-harder-for-primary-PCI-device.patch
Whith libpciaccess code path irrelevant for Linux.
* N_0001-Fix-segfault-when-killing-X-with-ctrl-alt-backspace.patch
Solved differently upstream
* N_bug-197858_dpms.diff
This one is upstream already - apparently nobody check this when
it no longer applied...
* N_bug534768-prefer_local_symbols.patch
Upstream has a better suggestion how to solve this. However this
patch is no longer needed
* N_dpms_screensaver.diff
This topic was solved slightly differently upstream - still patch
got ported without checking it's context.
* N_randr1_1-sig11.diff
No longer needed. Problem was fixed differently upstream.
* u_vgaHW-no-legacy.patch
Problem solved in the nv driver.
- Renamed:
Those patches will go upstream, thus they are prefixed by a u_:
* n__confine_to_shape.diff -> u_confine_to_shape.diff
* N_fbdevhw.diff -> u_fbdevhw.diff
* n_x86emu-include-order.patch -> u_x86emu-include-order.patch
* N_xorg-server-xdmcp.patchA -> u_xorg-server-xdmcp.patch
Those patches no longer apply but are kept for reference thus prefixed by b_:
* N_0001-Prevent-XSync-Alarms-from-senslessly-calling-CheckTr.patch ->
b_0001-Prevent-XSync-Alarms-from-senslessly-calling-CheckTr.patch
* N_cache-xkbcomp-output-for-fast-start-up.patch ->
b_cache-xkbcomp-output-for-fast-start-up.patch
* N_sync-fix.patch -> b_sync-fix.patch
OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xorg-x11-server?expand=0&rev=478
48 lines
1.4 KiB
Diff
48 lines
1.4 KiB
Diff
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 "compiler.h"
|
|
#include "xf86_OSproc.h"
|
|
@@ -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
|