Commit ac98fa84 authored by Markus Armbruster's avatar Markus Armbruster
Browse files

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: default avatarMarkus Armbruster <armbru@redhat.com>
Message-Id: <1444320700-26260-2-git-send-email-armbru@redhat.com>
Reviewed-by: default avatarGerd Hoffmann <kraxel@redhat.com>
parent b37686f7

include/standard-headers/linux/input.h

+2 −2
Original line number Diff line number Diff line
@@ -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

scripts/update-linux-headers.sh

+1 −0
Original line number Diff line number Diff line
@@ -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";

}