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 /include | |
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.
Diffstat (limited to 'include')
-rw-r--r-- | include/drm/drm.h | 4 |
1 files changed, 4 insertions, 0 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 */ }; |