__glGetProcAddress: explictly cast function pointers to void *
authorAlan Coopersmith <alan.coopersmith@oracle.com>
Tue, 4 Feb 2014 01:38:24 +0000 (17:38 -0800)
committerKeith Packard <keithp@keithp.com>
Sat, 8 Feb 2014 00:14:58 +0000 (16:14 -0800)
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 <alan.coopersmith@oracle.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
glx/glxext.c

index 6a34ac2..c9b8cc5 100644 (file)
@@ -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;
 }
 
 /*