Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 00fdf360 authored by Daniel Vetter's avatar Daniel Vetter
Browse files

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: default avatarDaniel Kurtz <djkurtz@chromium.org>
    Signed-off-by: default avatarEric Anholt <eric@anholt.net>
    Reviewed-by: default avatarEric Anholt <eric@anholt.net>

Reviewed-by: default avatarEmil Velikov <emil.l.velikov@gmail.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1459348943-12803-2-git-send-email-daniel.vetter@ffwll.ch
parent 4c5b7f3a

include/uapi/drm/drm.h

+2 −2
Original line number Diff line number Diff line
@@ -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 {