From 843a7bf571e09e9f554a8e4f9a134899729c03dc Mon Sep 17 00:00:00 2001
From: Jonas Kulla <Nyocurio@gmail.com>
Date: Tue, 24 Jun 2014 23:33:58 +0200
Subject: [PATCH] gl-fun.h: Fix KHR_debug function signatures

---
 src/debuglogger.cpp | 5 +++--
 src/gl-fun.h        | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/debuglogger.cpp b/src/debuglogger.cpp
index 54d3c8f..94d7c5b 100644
--- a/src/debuglogger.cpp
+++ b/src/debuglogger.cpp
@@ -60,9 +60,10 @@ static void APIENTRY arbDebugFunc(GLenum source,
                                   GLenum severity,
                                   GLsizei length,
                                   const GLchar* message,
-                                  GLvoid* userParam)
+                                  const void* userParam)
 {
-	DebugLoggerPrivate *p = static_cast<DebugLoggerPrivate*>(userParam);
+	DebugLoggerPrivate *p =
+		static_cast<DebugLoggerPrivate*>(const_cast<void*>(userParam));
 
 	(void) source;
 	(void) type;
diff --git a/src/gl-fun.h b/src/gl-fun.h
index e636eaa..7f20ae1 100644
--- a/src/gl-fun.h
+++ b/src/gl-fun.h
@@ -51,8 +51,8 @@ typedef void (APIENTRYP PFNGLTEXPARAMETERIPROC) (GLenum target, GLenum pname, GL
 typedef void (APIENTRYP PFNGLACTIVETEXTUREPROC) (GLenum texture);
 
 /* Debug callback */
-typedef void (APIENTRY * GLDEBUGPROC) (GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar* message, GLvoid* userParam);
-typedef void (APIENTRYP PFNGLDEBUGMESSAGECALLBACKPROC) (GLDEBUGPROC callback, const GLvoid *userParam);
+typedef void (APIENTRY * GLDEBUGPROC) (GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar* message, const void *userParam);
+typedef void (APIENTRYP PFNGLDEBUGMESSAGECALLBACKPROC) (GLDEBUGPROC callback, const void *userParam);
 
 #define GL_20_FUN \
 	/* Etc */ \