Mesa (glsl2): mesa: Avoid using c++ keyword in dri_util. h when compiled with c++.
Eric Anholt
anholt at kemper.freedesktop.org
Sat Aug 14 00:55:44 UTC 2010
Module: Mesa
Branch: glsl2
Commit: 9c3acce68001fdf7f5c77d1819d576b4cf92410a
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=9c3acce68001fdf7f5c77d1819d576b4cf92410a
Author: Eric Anholt <eric at anholt.net>
Date: Tue Aug 10 22:33:39 2010 -0700
mesa: Avoid using c++ keyword in dri_util.h when compiled with c++.
---
src/mesa/drivers/dri/common/dri_util.h | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/src/mesa/drivers/dri/common/dri_util.h b/src/mesa/drivers/dri/common/dri_util.h
index bc647ff..e2fcdaa 100644
--- a/src/mesa/drivers/dri/common/dri_util.h
+++ b/src/mesa/drivers/dri/common/dri_util.h
@@ -513,7 +513,11 @@ struct __DRIscreenRec {
*
* This pointer is never touched by the DRI layer.
*/
+#ifdef __cplusplus
+ void *priv;
+#else
void *private;
+#endif
/* Extensions provided by the loader. */
const __DRIgetDrawableInfoExtension *getDrawableInfo;
More information about the mesa-commit
mailing list