diff options
author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2016-03-30 10:42:23 -0400 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2016-03-31 01:57:50 -0400 |
commit | 00fdf360d05111d4dfc4cb03727ff26f8ab2fd46 (patch) | |
tree | 48fd3b8ace972e6b817ddbb58522c3c02d656990 | |
parent | 4c5b7f3ae53b02136d38dee46b412ac8a7f6f4ff (diff) |
drm: Make uapi headers C89 pendantic compliant
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>
Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1459348943-12803-2-git-send-email-daniel.vetter@ffwll.ch
-rw-r--r-- | include/uapi/drm/drm.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/uapi/drm/drm.h b/include/uapi/drm/drm.h index fbc0818bb95b..368325061ca7 100644 --- a/include/uapi/drm/drm.h +++ b/include/uapi/drm/drm.h | |||
@@ -187,7 +187,7 @@ enum drm_map_type { | |||
187 | _DRM_SHM = 2, /**< shared, cached */ | 187 | _DRM_SHM = 2, /**< shared, cached */ |
188 | _DRM_AGP = 3, /**< AGP/GART */ | 188 | _DRM_AGP = 3, /**< AGP/GART */ |
189 | _DRM_SCATTER_GATHER = 4, /**< Scatter/gather memory for PCI DMA */ | 189 | _DRM_SCATTER_GATHER = 4, /**< Scatter/gather memory for PCI DMA */ |
190 | _DRM_CONSISTENT = 5, /**< Consistent memory for PCI DMA */ | 190 | _DRM_CONSISTENT = 5 /**< Consistent memory for PCI DMA */ |
191 | }; | 191 | }; |
192 | 192 | ||
193 | /** | 193 | /** |
@@ -441,7 +441,7 @@ struct drm_draw { | |||
441 | * DRM_IOCTL_UPDATE_DRAW ioctl argument type. | 441 | * DRM_IOCTL_UPDATE_DRAW ioctl argument type. |
442 | */ | 442 | */ |
443 | typedef enum { | 443 | typedef enum { |
444 | DRM_DRAWABLE_CLIPRECTS, | 444 | DRM_DRAWABLE_CLIPRECTS |
445 | } drm_drawable_info_type_t; | 445 | } drm_drawable_info_type_t; |
446 | 446 | ||
447 | struct drm_update_draw { | 447 | struct drm_update_draw { |