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.

diff --git a/include/drm/drm.h b/include/drm/drm.h
index a0559eb08a688b7eee5dd460483c59204ae911d7..2ba713645ded4f989951eedf100ee2c677255a1c 100644 (file)
--- 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 65fd603a4723b73f8ab643c3b19a80336734f2c6..9df51686d03abcbc0c45587de76c4a764ac54396 100644 (file)
--- 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,