| Message ID | 1461269857-12813-7-git-send-email-emil.l.velikov@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Thu, Apr 21, 2016 at 09:17:19PM +0100, Emil Velikov wrote: > Cc: Daniel Vetter <daniel.vetter@ffwll.ch> > Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com> > > --- > > Daniel, > > Based on earlier chat that his file has never been used by userspace, > should we just move it for internal usage (to include/drm) ? The userspace that cares has its own private copy (with different names even), and this is definitely uapi. I think it should stay in include/uapi, and maybe for simplicity we simply include it in the set of headers delivered by libdrm? It certainly doesn't hurt to do so I think. Ack on this patch, and ack on updating libdrm with it. -Daniel > > Regards, > Emil > --- > include/uapi/drm/i810_drm.h | 8 ++++++++ > 1 file changed, 8 insertions(+) > > diff --git a/include/uapi/drm/i810_drm.h b/include/uapi/drm/i810_drm.h > index bdb0287..6e6cf86 100644 > --- a/include/uapi/drm/i810_drm.h > +++ b/include/uapi/drm/i810_drm.h > @@ -3,6 +3,10 @@ > > #include "drm.h" > > +#if defined(__cplusplus) > +extern "C" { > +#endif > + > /* WARNING: These defines must be the same as what the Xserver uses. > * if you change them, you must change the defines in the Xserver. > */ > @@ -280,4 +284,8 @@ typedef struct _drm_i810_mc { > unsigned int last_render; /* Last Render Request */ > } drm_i810_mc_t; > > +#if defined(__cplusplus) > +} > +#endif > + > #endif /* _I810_DRM_H_ */ > -- > 2.6.2 >
diff --git a/include/uapi/drm/i810_drm.h b/include/uapi/drm/i810_drm.h index bdb0287..6e6cf86 100644 --- a/include/uapi/drm/i810_drm.h +++ b/include/uapi/drm/i810_drm.h @@ -3,6 +3,10 @@ #include "drm.h" +#if defined(__cplusplus) +extern "C" { +#endif + /* WARNING: These defines must be the same as what the Xserver uses. * if you change them, you must change the defines in the Xserver. */ @@ -280,4 +284,8 @@ typedef struct _drm_i810_mc { unsigned int last_render; /* Last Render Request */ } drm_i810_mc_t; +#if defined(__cplusplus) +} +#endif + #endif /* _I810_DRM_H_ */
Cc: Daniel Vetter <daniel.vetter@ffwll.ch> Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com> --- Daniel, Based on earlier chat that his file has never been used by userspace, should we just move it for internal usage (to include/drm) ? Regards, Emil --- include/uapi/drm/i810_drm.h | 8 ++++++++ 1 file changed, 8 insertions(+)