diff options
| author | marha <marha@users.sourceforge.net> | 2013-07-16 08:59:33 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-07-16 08:59:33 +0200 |
| commit | d00d82f6017166fdeb927320ce4c656cb99319fd (patch) | |
| tree | 75d388ec743971c4bdcc85b639f8bc35458b27e0 /mesalib/src/mesa/main/errors.c | |
| parent | 707c146a74f6ff862be3ebb2470d1f31e29dd907 (diff) | |
| parent | 06f4de23ace4de1fd628c37891214f0a4ecb77db (diff) | |
| download | vcxsrv-d00d82f6017166fdeb927320ce4c656cb99319fd.tar.gz vcxsrv-d00d82f6017166fdeb927320ce4c656cb99319fd.tar.bz2 vcxsrv-d00d82f6017166fdeb927320ce4c656cb99319fd.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
libxcb xcb-proto mesa xkbcomp git update 16 Jul 2013
Conflicts:
mesalib/src/glsl/glsl_symbol_table.cpp
Diffstat (limited to 'mesalib/src/mesa/main/errors.c')
| -rw-r--r-- | mesalib/src/mesa/main/errors.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mesalib/src/mesa/main/errors.c b/mesalib/src/mesa/main/errors.c index 465420766..5a0758d0b 100644 --- a/mesalib/src/mesa/main/errors.c +++ b/mesalib/src/mesa/main/errors.c @@ -659,7 +659,7 @@ _mesa_DebugMessageControlARB(GLenum gl_source, GLenum gl_type, } void GLAPIENTRY -_mesa_DebugMessageCallbackARB(GLDEBUGPROCARB callback, GLvoid *userParam) +_mesa_DebugMessageCallbackARB(GLDEBUGPROCARB callback, const void *userParam) { GET_CURRENT_CONTEXT(ctx); ctx->Debug.Callback = callback; |