diff options
| author | Gerd Hoffmann <kraxel@redhat.com> | 2015-07-14 13:44:12 +0200 |
|---|---|---|
| committer | Gerd Hoffmann <kraxel@redhat.com> | 2015-07-16 17:34:41 +0200 |
| commit | e2f6bac3010419426b636d2b307f66deecd60813 (patch) | |
| tree | 05d1bdbe21a51f45d0bf4d02e81d6f7e0274f69c | |
| parent | 2a19b229f6c2f7288bb8c2498bffb01d67810dee (diff) | |
| download | qemu-e2f6bac3010419426b636d2b307f66deecd60813.tar.gz | |
virtio-input: move sys/ioctl.h include
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 <kraxel@redhat.com>
| -rw-r--r-- | hw/input/virtio-input-host.c | 1 | ||||
| -rw-r--r-- | include/standard-headers/linux/input.h | 1 | ||||
| -rwxr-xr-x | scripts/update-linux-headers.sh | 1 |
3 files changed, 2 insertions, 1 deletions
diff --git a/hw/input/virtio-input-host.c b/hw/input/virtio-input-host.c index f7e3d844e6..8978f16bae 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 a459dd25da..b003c67059 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 47378d93d4..f0e830c2d6 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 |