diff options
| author | marha <marha@users.sourceforge.net> | 2013-06-28 16:49:07 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-06-28 16:49:07 +0200 |
| commit | 3c204c4a20943586532ce477ced827d108f3b4b0 (patch) | |
| tree | c9891fdc315c41cc90806634589231172572b2ba /mesalib/src/mesa/main/errors.c | |
| parent | 73a26452133415b7e3bf54836d23995d59a7bac4 (diff) | |
| parent | ced1a6b8f5a750fcd3b8d3d0d9bbdee830064e6c (diff) | |
| download | vcxsrv-3c204c4a20943586532ce477ced827d108f3b4b0.tar.gz vcxsrv-3c204c4a20943586532ce477ced827d108f3b4b0.tar.bz2 vcxsrv-3c204c4a20943586532ce477ced827d108f3b4b0.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
fontconfig mesa git update 28 June 2013
libXext mesa git update 29 June 20013
Diffstat (limited to 'mesalib/src/mesa/main/errors.c')
| -rw-r--r-- | mesalib/src/mesa/main/errors.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mesalib/src/mesa/main/errors.c b/mesalib/src/mesa/main/errors.c index cc652bac8..465420766 100644 --- a/mesalib/src/mesa/main/errors.c +++ b/mesalib/src/mesa/main/errors.c @@ -659,11 +659,11 @@ _mesa_DebugMessageControlARB(GLenum gl_source, GLenum gl_type, } void GLAPIENTRY -_mesa_DebugMessageCallbackARB(GLDEBUGPROCARB callback, const GLvoid *userParam) +_mesa_DebugMessageCallbackARB(GLDEBUGPROCARB callback, GLvoid *userParam) { GET_CURRENT_CONTEXT(ctx); ctx->Debug.Callback = callback; - ctx->Debug.CallbackData = (void *) userParam; + ctx->Debug.CallbackData = userParam; } void |