[PATCH xserver] Change include order to avoid conflict with system header

[Emil Velikov]

Hi Stefan,

On 28 April 2016 at 13:47, Stefan Dirsch <sndirsch at suse.de> wrote:
> From: Andreas Schwab <schwab at suse.de>
>
> R_SP is also defined in <sys/ucontext.h> on m68k.
> Also remove duplicate definitions.
>
> Signed-off-by: Andreas Schwab <schwab at suse.de>
> ---
>  hw/xfree86/int10/xf86x86emu.c   | 2 +-
>  hw/xfree86/x86emu/x86emu/regs.h | 8 --------
>  2 files changed, 1 insertion(+), 9 deletions(-)
>
> diff --git a/hw/xfree86/int10/xf86x86emu.c b/hw/xfree86/int10/xf86x86emu.c
> index 4b0a130..1dc695d 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>
>
Imho it's better to add a comment about such changes. Otherwise the
next person who's here (even yourself X months down the line) is
likely to revert it.

Regards,
Emil