diff options
| author | Markus Armbruster <armbru@redhat.com> | 2015-10-08 18:11:39 +0200 |
|---|---|---|
| committer | Markus Armbruster <armbru@redhat.com> | 2015-10-09 15:22:39 +0200 |
| commit | ac98fa849e834f48e5a64cf4b22218ba4047e142 (patch) | |
| tree | e9ef75320f015ba50d889ed3eff7892ca6004215 /include/standard-headers | |
| parent | b37686f7e84b22cfaf7fd01ac5133f2617cc3027 (diff) | |
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>
Diffstat (limited to 'include/standard-headers')
| -rw-r--r-- | include/standard-headers/linux/input.h | 4 |
1 files changed, 2 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 |