diff options
| author | Eric Anholt <eric@anholt.net> | 2010-08-26 15:39:28 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2010-08-26 15:45:12 -0700 |
| commit | 23287f05cf2443ddf9e028e29beb5bd30979c6cf (patch) | |
| tree | 110b36e0fca11b8b52767301f9fdadc828d3073e | |
| parent | 8a76244a0fd09d0e3298fe68af812d7eaa4dbcb5 (diff) | |
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.
| -rw-r--r-- | include/drm/drm.h | 4 | ||||
| -rw-r--r-- | intel/intel_bufmgr.h | 6 |
2 files changed, 9 insertions, 1 deletions
diff --git a/include/drm/drm.h b/include/drm/drm.h index a0559eb0..2ba71364 100644 --- a/include/drm/drm.h +++ b/include/drm/drm.h @@ -373,7 +373,11 @@ struct drm_buf_pub { */ struct drm_buf_map { int count; /**< Length of the buffer list */ +#ifdef __cplusplus + void *virt; +#else void *virtual; /**< Mmap'd area in user-virtual */ +#endif struct drm_buf_pub *list; /**< Buffer information */ }; diff --git a/intel/intel_bufmgr.h b/intel/intel_bufmgr.h index 65fd603a..9df51686 100644 --- a/intel/intel_bufmgr.h +++ b/intel/intel_bufmgr.h @@ -66,7 +66,11 @@ struct _drm_intel_bo { * Virtual address for accessing the buffer data. Only valid while * mapped. */ +#ifdef __cplusplus + void *virt; +#else void *virtual; +#endif /** Buffer manager context associated with this buffer object */ 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, const char *name, 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 (*invalidate_cb) (drm_intel_bo * bo, |