summaryrefslogtreecommitdiffstats
path: root/src/glx/glxclient.h
diff options
context:
space:
mode:
authorIan Romanick <ian.d.romanick@intel.com>2011-11-28 17:47:59 -0800
committerIan Romanick <ian.d.romanick@intel.com>2012-01-02 12:41:45 -0800
commit8a4b36de05a133c1c9527836ca58bf8ebdf229bd (patch)
treeba269aae43de7d36647275fed2f4cd3a60efa8a4 /src/glx/glxclient.h
parente6280c3ba9579bf01f8b82e19497ba8f142a8d09 (diff)
downloadexternal_mesa3d-8a4b36de05a133c1c9527836ca58bf8ebdf229bd.zip
external_mesa3d-8a4b36de05a133c1c9527836ca58bf8ebdf229bd.tar.gz
external_mesa3d-8a4b36de05a133c1c9527836ca58bf8ebdf229bd.tar.bz2
glx: Don't use 'new' as a function parameter name
Using 'new' as a function parameter name prevents including glxclient.h the unit tests (future patch) that use the Google C++ Testing Framework. Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Diffstat (limited to 'src/glx/glxclient.h')
-rw-r--r--src/glx/glxclient.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/glx/glxclient.h b/src/glx/glxclient.h
index 13cd939..f8ae450 100644
--- a/src/glx/glxclient.h
+++ b/src/glx/glxclient.h
@@ -215,7 +215,7 @@ struct glx_context_vtable {
void (*destroy)(struct glx_context *ctx);
int (*bind)(struct glx_context *context, struct glx_context *old,
GLXDrawable draw, GLXDrawable read);
- void (*unbind)(struct glx_context *context, struct glx_context *new);
+ void (*unbind)(struct glx_context *context, struct glx_context *new_ctx);
void (*wait_gl)(struct glx_context *ctx);
void (*wait_x)(struct glx_context *ctx);
void (*use_x_font)(struct glx_context *ctx,