From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55120) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZkYmw-0007vs-U6 for qemu-devel@nongnu.org; Fri, 09 Oct 2015 10:36:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZkYmw-0003RC-33 for qemu-devel@nongnu.org; Fri, 09 Oct 2015 10:36:50 -0400 Received: from mx1.redhat.com ([209.132.183.28]:37665) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZkYmv-0003R2-TF for qemu-devel@nongnu.org; Fri, 09 Oct 2015 10:36:49 -0400 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) by mx1.redhat.com (Postfix) with ESMTPS id 7588CC0BE07D for ; Fri, 9 Oct 2015 14:36:49 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-33.ams2.redhat.com [10.36.116.33]) by int-mx14.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t99EaliE008041 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO) for ; Fri, 9 Oct 2015 10:36:49 -0400 From: Markus Armbruster Date: Fri, 9 Oct 2015 16:36:36 +0200 Message-Id: <1444401407-7849-2-git-send-email-armbru@redhat.com> In-Reply-To: <1444401407-7849-1-git-send-email-armbru@redhat.com> References: <1444401407-7849-1-git-send-email-armbru@redhat.com> Subject: [Qemu-devel] [PULL v3 01/12] update-linux-headers: Rename SW_MAX to SW_MAX_ List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org 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 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 Message-Id: <1444320700-26260-2-git-send-email-armbru@redhat.com> Reviewed-by: Gerd Hoffmann --- include/standard-headers/linux/input.h | 4 ++-- scripts/update-linux-headers.sh | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/include/standard-headers/linux/input.h b/include/standard-headers/linux/input.h index b003c67..43f1850 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 11076191..457ef37 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"; } -- 2.4.3