Mesa (master): glx: Don't use 'new' as a function parameter name

Ian Romanick idr at kemper.freedesktop.org
Mon Jan 2 20:42:42 UTC 2012


Module: Mesa
Branch: master
Commit: 8a4b36de05a133c1c9527836ca58bf8ebdf229bd
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=8a4b36de05a133c1c9527836ca58bf8ebdf229bd

Author: Ian Romanick <ian.d.romanick at intel.com>
Date:   Mon Nov 28 17:47:59 2011 -0800

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 at intel.com>

---

 src/glx/glxclient.h |    2 +-
 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,




More information about the mesa-commit mailing list