From: Gabriel Laskar <gabriel@lse.epita.fr>
To: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Daniel Vetter <daniel.vetter@intel.com>,
Emil Velikov <emil.l.velikov@gmail.com>,
DRI Development <dri-devel@lists.freedesktop.org>
Subject: Re: [PATCH 1/3] drm: Make drm.h uapi header safe for C++
Date: Wed, 6 Apr 2016 17:58:40 +0200 [thread overview]
Message-ID: <20160406175840.14b78e4a@punk.lab.lse.epita.fr> (raw)
In-Reply-To: <1459347584-30566-1-git-send-email-daniel.vetter@ffwll.ch>
On Wed, 30 Mar 2016 16:19:42 +0200
Daniel Vetter <daniel.vetter@ffwll.ch> wrote:
> virtual is a protected keyword in C++ and can't be used at all. Ugh.
>
> This aligns the kernel versions of the drm headers with the ones in
> libdrm.
>
> Cc: Emil Velikov <emil.l.velikov@gmail.com>
> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
> ---
> include/uapi/drm/drm.h | 4 ++++
> 1 file changed, 4 insertions(+)
>
> diff --git a/include/uapi/drm/drm.h b/include/uapi/drm/drm.h
> index a0ebfe7c9a28..d299c7749091 100644
> --- a/include/uapi/drm/drm.h
> +++ b/include/uapi/drm/drm.h
> @@ -373,7 +373,11 @@ struct drm_buf_pub {
> */
> struct drm_buf_map {
> int count; /**< Length of the buffer list */
> +#ifdef __cplusplus
> + void *virt;
> +#else
> void __user *virtual; /**< Mmap'd area in
> user-virtual */ +#endif
> struct drm_buf_pub __user *list; /**< Buffer
> information */ };
>
Why not simply rename the field ?
--
Gabriel Laskar
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
next prev parent reply other threads:[~2016-04-06 16:07 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-30 14:19 [PATCH 1/3] drm: Make drm.h uapi header safe for C++ Daniel Vetter
2016-03-30 14:19 ` [PATCH 2/3] drm: align #include directives with libdrm in uapi headers Daniel Vetter
2016-03-30 15:05 ` Emil Velikov
2016-03-30 15:11 ` Daniel Vetter
2016-03-30 15:22 ` Emil Velikov
2016-03-30 15:54 ` [PATCH] " Daniel Vetter
2016-03-30 16:08 ` Emil Velikov
2016-03-30 14:19 ` [PATCH 3/3] drm: Move DRM_MODE_OBJECT_* to " Daniel Vetter
2016-03-30 16:07 ` Emil Velikov
2016-03-30 17:55 ` Paulo Zanoni
2016-03-30 19:07 ` Daniel Vetter
2016-03-30 14:42 ` [PATCH 1/2] drm: Untangle __KERNEL__ guards Daniel Vetter
2016-03-30 14:42 ` [PATCH 2/2] drm: Make uapi headers C89 pendantic compliant Daniel Vetter
2016-03-30 20:06 ` Emil Velikov
2016-03-31 5:58 ` Daniel Vetter
2016-03-30 15:56 ` [PATCH 1/2] drm: Untangle __KERNEL__ guards Emil Velikov
2016-03-30 19:11 ` Daniel Vetter
2016-03-30 15:12 ` [PATCH] drm: Make drm.h uapi header safe for C++ Daniel Vetter
2016-03-30 15:56 ` Emil Velikov
2016-04-06 15:58 ` Gabriel Laskar [this message]
2016-04-06 16:35 ` [PATCH 1/3] " Emil Velikov
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=20160406175840.14b78e4a@punk.lab.lse.epita.fr \
--to=gabriel@lse.epita.fr \
--cc=daniel.vetter@ffwll.ch \
--cc=daniel.vetter@intel.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=emil.l.velikov@gmail.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: link
Be 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.