xfree86: int10: Fix build on ARM

Submitted by Thierry Reding on Feb. 12, 2014, 4:11 p.m.

Details

Message ID 1392221500-31954-1-git-send-email-treding@nvidia.com
State Accepted
Commit b92a9289fef4831e9af69e5f6f64b5454f550559
Headers show

Not browsing as part of any series.

Commit Message

Thierry Reding Feb. 12, 2014, 4:11 p.m.
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>
---
 hw/xfree86/int10/xf86x86emu.c | 1 -
 1 file changed, 1 deletion(-)

Patch hide | download patch | download mbox

diff --git a/hw/xfree86/int10/xf86x86emu.c b/hw/xfree86/int10/xf86x86emu.c
index b9a4d3603e93..4b0a13090dce 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