From 08c7df9b0870fadf7b4655825459ff2e5a5c47da Mon Sep 17 00:00:00 2001 From: Alan Coopersmith Date: Mon, 3 Feb 2014 17:38:24 -0800 Subject: [PATCH] __glGetProcAddress: explictly cast function pointers to void * Fixes Solaris Studio compiler warning & error: "glxext.c", line 557: warning: assignment type mismatch: pointer to void "=" pointer to function(void) returning void "glxext.c", line 559: error: operands have incompatible types: pointer to void ":" pointer to function(void) returning void Signed-off-by: Alan Coopersmith Signed-off-by: Keith Packard --- glx/glxext.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/glx/glxext.c b/glx/glxext.c index 6a34ac299..c9b8cc5b3 100644 --- a/glx/glxext.c +++ b/glx/glxext.c @@ -554,9 +554,9 @@ __glXsetGetProcAddress(glx_gpa_proc get_proc_address) void *__glGetProcAddress(const char *proc) { - void *ret = _get_proc_address(proc); + void *ret = (void *) _get_proc_address(proc); - return ret ? ret : NoopDDA; + return ret ? ret : (void *) NoopDDA; } /*