| Message ID | 1459348943-12803-2-git-send-email-daniel.vetter@ffwll.ch (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 30 March 2016 at 15:42, Daniel Vetter <daniel.vetter@ffwll.ch> wrote: > This ports the below libdrm commit to the kernel > > commit 0f4452bb51306024fbf4cbf77d8baab20cefba67 > Author: Daniel Kurtz <djkurtz@chromium.org> > Date: Mon Aug 26 23:39:16 2013 +0800 > > libdrm: Make some drm headers compatible with gcc -std=c89 -pedantic > > The following minor changes were needed to these headers: > * Convert // comments to /* */ > * No , after final member of enum > > With these changes, these header files can be included by a program that > is built with gcc options: > -std=c89 -Werror -pedantic > > Signed-off-by: Daniel Kurtz <djkurtz@chromium.org> > Signed-off-by: Eric Anholt <eric@anholt.net> > Reviewed-by: Eric Anholt <eric@anholt.net> > > Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> Yes, please :-) Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com> -Emil
On Wed, Mar 30, 2016 at 09:06:33PM +0100, Emil Velikov wrote: > On 30 March 2016 at 15:42, Daniel Vetter <daniel.vetter@ffwll.ch> wrote: > > This ports the below libdrm commit to the kernel > > > > commit 0f4452bb51306024fbf4cbf77d8baab20cefba67 > > Author: Daniel Kurtz <djkurtz@chromium.org> > > Date: Mon Aug 26 23:39:16 2013 +0800 > > > > libdrm: Make some drm headers compatible with gcc -std=c89 -pedantic > > > > The following minor changes were needed to these headers: > > * Convert // comments to /* */ > > * No , after final member of enum > > > > With these changes, these header files can be included by a program that > > is built with gcc options: > > -std=c89 -Werror -pedantic > > > > Signed-off-by: Daniel Kurtz <djkurtz@chromium.org> > > Signed-off-by: Eric Anholt <eric@anholt.net> > > Reviewed-by: Eric Anholt <eric@anholt.net> > > > > Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> > Yes, please :-) > > Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com> Also applied, thanks for your review. -Daniel
diff --git a/include/uapi/drm/drm.h b/include/uapi/drm/drm.h index 3b56285a7e2a..8b41297038aa 100644 --- a/include/uapi/drm/drm.h +++ b/include/uapi/drm/drm.h @@ -187,7 +187,7 @@ enum drm_map_type { _DRM_SHM = 2, /**< shared, cached */ _DRM_AGP = 3, /**< AGP/GART */ _DRM_SCATTER_GATHER = 4, /**< Scatter/gather memory for PCI DMA */ - _DRM_CONSISTENT = 5, /**< Consistent memory for PCI DMA */ + _DRM_CONSISTENT = 5 /**< Consistent memory for PCI DMA */ }; /** @@ -441,7 +441,7 @@ struct drm_draw { * DRM_IOCTL_UPDATE_DRAW ioctl argument type. */ typedef enum { - DRM_DRAWABLE_CLIPRECTS, + DRM_DRAWABLE_CLIPRECTS } drm_drawable_info_type_t; struct drm_update_draw {
This ports the below libdrm commit to the kernel commit 0f4452bb51306024fbf4cbf77d8baab20cefba67 Author: Daniel Kurtz <djkurtz@chromium.org> Date: Mon Aug 26 23:39:16 2013 +0800 libdrm: Make some drm headers compatible with gcc -std=c89 -pedantic The following minor changes were needed to these headers: * Convert // comments to /* */ * No , after final member of enum With these changes, these header files can be included by a program that is built with gcc options: -std=c89 -Werror -pedantic Signed-off-by: Daniel Kurtz <djkurtz@chromium.org> Signed-off-by: Eric Anholt <eric@anholt.net> Reviewed-by: Eric Anholt <eric@anholt.net> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> --- include/uapi/drm/drm.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)