From: Thierry Reding <thierry.reding@gmail.com>
Date: Wed, 12 Feb 2014 16:11:40 +0000 (+0100)
Subject: xfree86: int10: Fix build on ARM
X-Git-Tag: upstream/1.16~67
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b92a9289fef4831e9af69e5f6f64b5454f550559;p=platform%2Fupstream%2Fxorg-server.git

xfree86: int10: Fix build on ARM

Commit 7353ec7cb6fc235b03e59e35425201429c83ee72 "xfree86: Switch int10
code to stdint types" uses designated initializers to setup the fields
of the X86EMU_pioFuncs.

This breaks compilation on ARM, since out{b,w,l}() are redefined using
the preprocessor and therefore cause the compiler to complain about
non-existent fields being assigned to.

It seems like the compiler.h header that contains these redefinitions
isn't actually needed in xf86x86emu.c, so the easiest "fix" is to not
include it.

Signed-off-by: Thierry Reding <treding@nvidia.com>
Reviewed-by: Rob Clark <robdclark@gmail.com>
---

diff --git a/hw/xfree86/int10/xf86x86emu.c b/hw/xfree86/int10/xf86x86emu.c
index b9a4d36..4b0a130 100644
--- a/hw/xfree86/int10/xf86x86emu.c
+++ b/hw/xfree86/int10/xf86x86emu.c
@@ -9,7 +9,6 @@
 
 #include <x86emu.h>
 #include "xf86.h"
-#include "compiler.h"
 #include "xf86_OSproc.h"
 #include "xf86Pci.h"
 #define _INT10_PRIVATE