aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Armbruster <armbru@redhat.com>2015-10-08 18:11:39 +0200
committerMarkus Armbruster <armbru@redhat.com>2015-10-09 15:22:39 +0200
commitac98fa849e834f48e5a64cf4b22218ba4047e142 (patch)
treee9ef75320f015ba50d889ed3eff7892ca6004215
parentb37686f7e84b22cfaf7fd01ac5133f2617cc3027 (diff)
downloadqemu-arm-ac98fa849e834f48e5a64cf4b22218ba4047e142.tar.gz
update-linux-headers: Rename SW_MAX to SW_MAX_
The next commit will compile hw/input/virtio-input.c and hw/input/virtio-input-hid.c even when CONFIG_LINUX is off. These files include both "include/standard-headers/linux/input.h" and <windows.h> then. Doesn't work, because both define SW_MAX. We don't actually use it. Patch input.h to define SW_MAX_ instead. Signed-off-by: Markus Armbruster <armbru@redhat.com> Message-Id: <1444320700-26260-2-git-send-email-armbru@redhat.com> Reviewed-by: Gerd Hoffmann <kraxel@redhat.com>
-rw-r--r--include/standard-headers/linux/input.h4
-rwxr-xr-xscripts/update-linux-headers.sh1
2 files changed, 3 insertions, 2 deletions
diff --git a/include/standard-headers/linux/input.h b/include/standard-headers/linux/input.h
index b003c67059..43f1850b6b 100644
--- a/include/standard-headers/linux/input.h
+++ b/include/standard-headers/linux/input.h
@@ -887,8 +887,8 @@ struct input_keymap_entry {
#define SW_ROTATE_LOCK 0x0c /* set = rotate locked/disabled */
#define SW_LINEIN_INSERT 0x0d /* set = inserted */
#define SW_MUTE_DEVICE 0x0e /* set = device disabled */
-#define SW_MAX 0x0f
-#define SW_CNT (SW_MAX+1)
+#define SW_MAX_ 0x0f
+#define SW_CNT (SW_MAX_+1)
/*
* Misc events
diff --git a/scripts/update-linux-headers.sh b/scripts/update-linux-headers.sh
index 1107619121..457ef37b95 100755
--- a/scripts/update-linux-headers.sh
+++ b/scripts/update-linux-headers.sh
@@ -53,6 +53,7 @@ cp_portable() {
-e 's/__attribute__((packed))/QEMU_PACKED/' \
-e 's/__inline__/inline/' \
-e '/sys\/ioctl.h/d' \
+ -e 's/SW_MAX/SW_MAX_/' \
"$f" > "$to/$header";
}