From 9881bf6e69b52efc1eb57a4027d9a8817ef8cbcb Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Wed, 27 Jun 2012 10:52:55 -0600
Subject: 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
---
 src/mesa/main/dd.h     | 2 +-
 src/mesa/main/errors.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/mesa/main')

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
-- 
cgit v1.2.3