geemili
/
drm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Avoid use of c++ reserved keyword "virtual" when using a C++ compiler. 

Avoids requiring nasty hacks around libdrm headers in the new C++
parts of Mesa drivers.
main
Eric Anholt 2010-08-26 15:39:28 -07:00
parent 8a76244a0f
commit 23287f05cf
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/drm/drm.h
View File

@ -373,7 +373,11 @@ struct drm_buf_pub {
*/ */
struct drm_buf_map { struct drm_buf_map {
int count; /**< Length of the buffer list */ int count; /**< Length of the buffer list */
#ifdef __cplusplus
void *virt;
#else
void *virtual; /**< Mmap'd area in user-virtual */ void *virtual; /**< Mmap'd area in user-virtual */
#endif
struct drm_buf_pub *list; /**< Buffer information */ struct drm_buf_pub *list; /**< Buffer information */
}; };

6
intel/intel_bufmgr.h
View File

@ -66,7 +66,11 @@ struct _drm_intel_bo {
* Virtual address for accessing the buffer data. Only valid while * Virtual address for accessing the buffer data. Only valid while
* mapped. * mapped.
*/ */
#ifdef __cplusplus
void *virt;
#else
void *virtual; void *virtual;
#endif
/** Buffer manager context associated with this buffer object */ /** Buffer manager context associated with this buffer object */
drm_intel_bufmgr *bufmgr; drm_intel_bufmgr *bufmgr;
@ -168,7 +172,7 @@ void drm_intel_bufmgr_fake_set_fence_callback(drm_intel_bufmgr *bufmgr,
drm_intel_bo *drm_intel_bo_fake_alloc_static(drm_intel_bufmgr *bufmgr, drm_intel_bo *drm_intel_bo_fake_alloc_static(drm_intel_bufmgr *bufmgr,
const char *name, const char *name,
unsigned long offset, unsigned long offset,
unsigned long size, void *virtual); unsigned long size, void *virt);
void drm_intel_bo_fake_disable_backing_store(drm_intel_bo *bo, void drm_intel_bo_fake_disable_backing_store(drm_intel_bo *bo,
void (*invalidate_cb) (drm_intel_bo void (*invalidate_cb) (drm_intel_bo
* bo, * bo,