From: David Howells <dhowells@redhat.com> To: linux-api@vger.kernel.org, linux-kbuild@vger.kernel.org Cc: Mat Martineau <mathew.j.martineau@linux.intel.com>, keyrings@vger.kernel.org, linux-kernel@vger.kernel.org, dhowells@redhat.com Subject: [PATCH 02/11] UAPI: keys: Fix use of C++ keywords as structural members Date: Wed, 05 Sep 2018 15:54:47 +0000 [thread overview] Message-ID: <153616288762.23468.17409226604948361939.stgit@warthog.procyon.org.uk> (raw) In-Reply-To: <153616286704.23468.584491117180383924.stgit@warthog.procyon.org.uk> The keyctl_dh_params struct uses a C++ keyword as structural members. Fix this by inserting an anonymous union that provides an alternative name and then hide the reserved name in C++. Signed-off-by: David Howells <dhowells@redhat.com> cc: Mat Martineau <mathew.j.martineau@linux.intel.com> cc: keyrings@vger.kernel.org --- include/uapi/linux/keyctl.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/include/uapi/linux/keyctl.h b/include/uapi/linux/keyctl.h index 7b8c9e19bad1..170f015d1f25 100644 --- a/include/uapi/linux/keyctl.h +++ b/include/uapi/linux/keyctl.h @@ -65,7 +65,12 @@ /* keyctl structures */ struct keyctl_dh_params { - __s32 private; + union { +#ifndef __cplusplus + __s32 private; +#endif + __s32 dh_private; + }; __s32 prime; __s32 base; };
WARNING: multiple messages have this Message-ID (diff)
From: David Howells <dhowells@redhat.com> To: linux-api@vger.kernel.org, linux-kbuild@vger.kernel.org Cc: Mat Martineau <mathew.j.martineau@linux.intel.com>, keyrings@vger.kernel.org, linux-kernel@vger.kernel.org, dhowells@redhat.com Subject: [PATCH 02/11] UAPI: keys: Fix use of C++ keywords as structural members Date: Wed, 05 Sep 2018 16:54:47 +0100 [thread overview] Message-ID: <153616288762.23468.17409226604948361939.stgit@warthog.procyon.org.uk> (raw) In-Reply-To: <153616286704.23468.584491117180383924.stgit@warthog.procyon.org.uk> The keyctl_dh_params struct uses a C++ keyword as structural members. Fix this by inserting an anonymous union that provides an alternative name and then hide the reserved name in C++. Signed-off-by: David Howells <dhowells@redhat.com> cc: Mat Martineau <mathew.j.martineau@linux.intel.com> cc: keyrings@vger.kernel.org --- include/uapi/linux/keyctl.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/include/uapi/linux/keyctl.h b/include/uapi/linux/keyctl.h index 7b8c9e19bad1..170f015d1f25 100644 --- a/include/uapi/linux/keyctl.h +++ b/include/uapi/linux/keyctl.h @@ -65,7 +65,12 @@ /* keyctl structures */ struct keyctl_dh_params { - __s32 private; + union { +#ifndef __cplusplus + __s32 private; +#endif + __s32 dh_private; + }; __s32 prime; __s32 base; };
next prev parent reply other threads:[~2018-09-05 15:54 UTC|newest] Thread overview: 127+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-09-05 15:54 [RFC] UAPI: Check headers by compiling all together as C++ David Howells 2018-09-05 15:54 ` David Howells 2018-09-05 15:54 ` David Howells 2018-09-05 15:54 ` David Howells 2018-09-05 15:54 ` David Howells 2018-09-05 15:54 ` [PATCH 01/11] UAPI: drm: Fix use of C++ keywords as structural members David Howells 2018-09-05 15:54 ` David Howells 2018-09-05 15:54 ` David Howells [this message] 2018-09-05 15:54 ` [PATCH 02/11] UAPI: keys: " David Howells 2018-09-05 15:54 ` [PATCH 03/11] UAPI: virtio_net: " David Howells 2018-09-05 16:54 ` Greg KH 2018-09-05 16:54 ` Greg KH 2018-09-05 17:15 ` David Howells 2018-09-05 17:15 ` David Howells 2018-09-05 17:35 ` Michael S. Tsirkin 2018-09-05 17:35 ` Michael S. Tsirkin 2018-09-06 7:09 ` David Howells 2018-09-06 7:09 ` David Howells 2018-09-06 14:36 ` Michael S. Tsirkin 2018-09-06 14:36 ` Michael S. Tsirkin 2018-09-05 15:54 ` David Howells 2018-09-05 15:55 ` [PATCH 04/11] UAPI: bcache: Fix use of embedded flexible array David Howells 2018-10-02 14:52 ` Jan Engelhardt 2018-10-09 15:41 ` David Howells 2018-10-09 16:54 ` Jan Engelhardt 2018-09-05 15:55 ` [PATCH 05/11] UAPI: coda: Don't use internal kernel structs in UAPI David Howells 2018-09-05 16:54 ` Jan Harkes 2018-09-05 17:12 ` Yann Droneaud 2018-09-05 17:28 ` Jan Harkes 2018-09-05 17:28 ` Jan Harkes 2018-09-05 17:24 ` David Howells 2018-09-06 7:13 ` David Howells 2018-09-06 11:52 ` Yann Droneaud 2018-09-06 12:16 ` Jan Harkes 2018-09-06 12:16 ` Jan Harkes 2018-09-06 14:53 ` David Howells 2018-09-05 15:55 ` [PATCH 06/11] UAPI: netfilter: Fix symbol collision issues David Howells 2018-09-05 15:55 ` [PATCH 07/11] UAPI: nilfs2: Fix use of undefined byteswapping functions David Howells 2018-09-05 22:20 ` Al Viro 2018-09-05 15:55 ` [PATCH 08/11] UAPI: sound: Fix use of u32 and co. in UAPI headers David Howells 2018-09-05 15:55 ` David Howells 2018-09-06 5:59 ` Takashi Sakamoto 2018-09-06 5:59 ` Takashi Sakamoto 2018-09-06 8:17 ` David Howells 2018-09-05 15:55 ` [PATCH 09/11] UAPI: ndctl: Fix g++-unsupported initialisation in headers David Howells 2018-09-05 15:55 ` David Howells 2018-09-05 15:55 ` David Howells 2018-09-05 15:55 ` [PATCH 10/11] UAPI: ndctl: Remove use of PAGE_SIZE David Howells 2018-09-05 15:55 ` David Howells 2018-09-05 15:55 ` [PATCH 11/11] UAPI: Check headers build for C++ David Howells 2018-09-05 16:55 ` [RFC] UAPI: Check headers by compiling all together as C++ Greg KH 2018-09-05 16:55 ` Greg KH 2018-09-05 16:55 ` Greg KH 2018-09-05 16:55 ` Greg KH 2018-09-05 16:55 ` Greg KH 2018-09-05 16:55 ` Greg KH 2018-09-05 17:33 ` Yann Droneaud 2018-09-05 17:33 ` Yann Droneaud 2018-09-05 17:33 ` Yann Droneaud 2018-09-05 17:33 ` Yann Droneaud 2018-09-05 17:33 ` Yann Droneaud 2018-09-05 17:42 ` Michael S. Tsirkin 2018-09-05 17:42 ` Michael S. Tsirkin 2018-09-05 17:42 ` Michael S. Tsirkin 2018-09-05 17:42 ` Michael S. Tsirkin 2018-09-05 17:42 ` Michael S. Tsirkin 2018-09-05 17:42 ` Michael S. Tsirkin 2018-09-05 17:42 ` Michael S. Tsirkin 2018-09-06 7:12 ` Yann Droneaud 2018-09-06 7:12 ` Yann Droneaud 2018-09-06 7:12 ` Yann Droneaud 2018-09-06 7:12 ` Yann Droneaud 2018-09-06 7:12 ` Yann Droneaud 2018-09-05 19:22 ` Jan Engelhardt 2018-09-05 19:22 ` Jan Engelhardt 2018-09-05 19:22 ` Jan Engelhardt 2018-09-05 19:22 ` Jan Engelhardt 2018-09-05 19:22 ` Jan Engelhardt 2018-09-05 17:50 ` David Howells 2018-09-05 17:50 ` David Howells 2018-09-05 17:50 ` David Howells 2018-09-06 9:18 David Howells 2018-09-06 9:18 ` David Howells 2018-09-06 9:18 ` David Howells 2018-09-06 9:18 ` David Howells 2018-09-06 9:18 ` David Howells [not found] ` <153622549721.14298.8116794954073122489.stgit-S6HVgzuS8uM4Awkfq6JHfwNdhmdF6hFW@public.gmane.org> 2018-09-06 9:18 ` [PATCH 01/11] UAPI: drm: Fix use of C++ keywords as structural members [ver #2] David Howells 2018-09-06 9:18 ` David Howells 2018-09-06 9:18 ` [PATCH 02/11] UAPI: keys: " David Howells 2018-09-06 9:18 ` David Howells 2018-09-06 9:18 ` [PATCH 03/11] UAPI: virtio_net: " David Howells 2018-09-06 15:02 ` Michael S. Tsirkin 2018-09-06 15:02 ` Michael S. Tsirkin 2018-09-06 9:18 ` David Howells 2018-09-06 9:18 ` [PATCH 04/11] UAPI: bcache: Fix use of embedded flexible array " David Howells 2018-09-06 9:18 ` [PATCH 05/11] UAPI: coda: Move kernel internals out of public view " David Howells 2018-09-06 9:18 ` David Howells 2018-09-06 9:19 ` [PATCH 06/11] coda: Move internal defs out of include/linux/ " David Howells 2018-09-06 9:19 ` [PATCH 07/11] UAPI: netfilter: Fix symbol collision issues " David Howells 2018-09-10 17:32 ` kbuild test robot 2018-09-10 17:32 ` kbuild test robot 2018-09-10 17:32 ` kbuild test robot 2018-09-28 13:07 ` [netfilter-core] " Pablo Neira Ayuso 2018-10-09 15:35 ` David Howells 2018-09-06 9:19 ` [PATCH 08/11] UAPI: nilfs2: Fix use of undefined byteswapping functions " David Howells 2018-09-06 9:19 ` [PATCH 09/11] UAPI: ndctl: Fix g++-unsupported initialisation in headers " David Howells 2018-09-06 9:19 ` David Howells 2018-09-06 9:19 ` David Howells 2018-09-25 20:22 ` Dan Williams 2018-09-25 20:22 ` Dan Williams 2018-09-25 20:22 ` Dan Williams 2018-09-06 9:19 ` [PATCH 10/11] UAPI: ndctl: Remove use of PAGE_SIZE " David Howells 2018-09-06 9:19 ` David Howells 2018-09-06 9:19 ` David Howells 2018-09-25 20:17 ` Dan Williams 2018-09-25 20:17 ` Dan Williams 2018-09-25 20:17 ` Dan Williams 2018-10-09 15:36 ` David Howells 2018-10-09 15:36 ` David Howells 2018-09-06 9:19 ` [PATCH 11/11] UAPI: Check headers build for C++ " David Howells 2018-09-10 16:26 ` kbuild test robot 2018-09-10 16:26 ` kbuild test robot 2018-09-10 16:26 ` kbuild test robot 2018-09-10 17:02 ` kbuild test robot 2018-09-10 17:02 ` kbuild test robot 2018-09-10 17:02 ` kbuild test robot 2018-09-14 9:10 ` Arnd Bergmann
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=153616288762.23468.17409226604948361939.stgit@warthog.procyon.org.uk \ --to=dhowells@redhat.com \ --cc=keyrings@vger.kernel.org \ --cc=linux-api@vger.kernel.org \ --cc=linux-kbuild@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=mathew.j.martineau@linux.intel.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.