diff options
| author | Brian Paul <[email protected]> | 2012-06-27 10:52:55 -0600 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2012-06-27 15:37:10 -0600 |
| commit | 9881bf6e69b52efc1eb57a4027d9a8817ef8cbcb (patch) | |
| tree | 5cb1746a15eb8d5ef381695c5700d091826cc038 /src/mesa/main | |
| parent | 827bdee7d1ec29ce07f35780f7d2262f2fa0acf4 (diff) | |
mesa: more const qualifiers to match the latest glext.h
For some reason regular gcc on Linux didn't catch these but the mingw
compiler did (generated errors, not warnings).
v2: include the changes in src/mapi/ too
Diffstat (limited to 'src/mesa/main')
| -rw-r--r-- | src/mesa/main/dd.h | 2 | ||||
| -rw-r--r-- | src/mesa/main/errors.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/mesa/main/dd.h b/src/mesa/main/dd.h index 5bcf36bfa71..687a38f4487 100644 --- a/src/mesa/main/dd.h +++ b/src/mesa/main/dd.h @@ -1024,7 +1024,7 @@ typedef struct { void (GLAPIENTRYP MultiDrawElementsBaseVertex)( GLenum mode, const GLsizei *count, GLenum type, - const GLvoid **indices, + const GLvoid * const *indices, GLsizei primcount, const GLint *basevertex); void (GLAPIENTRYP DrawArraysInstanced)(GLenum mode, GLint first, diff --git a/src/mesa/main/errors.c b/src/mesa/main/errors.c index ef78a0bca46..8b96319ce43 100644 --- a/src/mesa/main/errors.c +++ b/src/mesa/main/errors.c @@ -718,11 +718,11 @@ _mesa_DebugMessageControlARB(GLenum source, GLenum type, GLenum severity, } static void GLAPIENTRY -_mesa_DebugMessageCallbackARB(GLDEBUGPROCARB callback, GLvoid *userParam) +_mesa_DebugMessageCallbackARB(GLDEBUGPROCARB callback, const GLvoid *userParam) { GET_CURRENT_CONTEXT(ctx); ctx->Debug.Callback = callback; - ctx->Debug.CallbackData = userParam; + ctx->Debug.CallbackData = (void *) userParam; } void |