[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 2/3] virtio-input: move sys/ioctl.h include
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PULL 2/3] virtio-input: move sys/ioctl.h include |
Date: |
Fri, 17 Jul 2015 08:52:53 +0200 |
Drop from include/standard-headers/linux/input.h
Add to hw/input/virtio-input-host.c instead.
That allows to build virtio-input (except pass-through) on windows.
Signed-off-by: Gerd Hoffmann <address@hidden>
---
hw/input/virtio-input-host.c | 1 +
include/standard-headers/linux/input.h | 1 -
scripts/update-linux-headers.sh | 1 +
3 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/hw/input/virtio-input-host.c b/hw/input/virtio-input-host.c
index f7e3d84..8978f16 100644
--- a/hw/input/virtio-input-host.c
+++ b/hw/input/virtio-input-host.c
@@ -11,6 +11,7 @@
#include "hw/virtio/virtio.h"
#include "hw/virtio/virtio-input.h"
+#include <sys/ioctl.h>
#include "standard-headers/linux/input.h"
/* ----------------------------------------------------------------- */
diff --git a/include/standard-headers/linux/input.h
b/include/standard-headers/linux/input.h
index a459dd2..b003c67 100644
--- a/include/standard-headers/linux/input.h
+++ b/include/standard-headers/linux/input.h
@@ -10,7 +10,6 @@
#include <sys/time.h>
-#include <sys/ioctl.h>
#include <sys/types.h>
#include "standard-headers/linux/types.h"
diff --git a/scripts/update-linux-headers.sh b/scripts/update-linux-headers.sh
index 47378d9..f0e830c 100755
--- a/scripts/update-linux-headers.sh
+++ b/scripts/update-linux-headers.sh
@@ -56,6 +56,7 @@ cp_virtio() {
-e 's/__bitwise__//' \
-e 's/__attribute__((packed))/QEMU_PACKED/' \
-e 's/__inline__/inline/' \
+ -e '/sys\/ioctl.h/d' \
"$f" > "$to/$header";
done
fi
--
1.8.3.1