31 lines
796 B
Diff
31 lines
796 B
Diff
From 487715ebb67cf9a75887279f4257cc93ed790594 Mon Sep 17 00:00:00 2001
|
|
From: Hans de Goede <hdegoede@redhat.com>
|
|
Date: Fri, 25 Apr 2014 09:07:04 +0200
|
|
Subject: [PATCH] Fix compilation of int10 module on arm
|
|
|
|
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
|
|
---
|
|
hw/xfree86/int10/xf86x86emu.c | 6 ++++++
|
|
1 file changed, 6 insertions(+)
|
|
|
|
diff --git a/hw/xfree86/int10/xf86x86emu.c b/hw/xfree86/int10/xf86x86emu.c
|
|
index b9a4d36..f3c2850 100644
|
|
--- a/hw/xfree86/int10/xf86x86emu.c
|
|
+++ b/hw/xfree86/int10/xf86x86emu.c
|
|
@@ -18,6 +18,12 @@
|
|
|
|
#define M _X86EMU_env
|
|
|
|
+/* compiler.h defines outb/outw/outl on arm this file does not need these and
|
|
+ this interferes with the pioFuncs struct initialization */
|
|
+#undef outb
|
|
+#undef outw
|
|
+#undef outl
|
|
+
|
|
static void
|
|
x86emu_do_int(int num)
|
|
{
|
|
--
|
|
1.9.0
|
|
|