From: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Tue, 4 Feb 2014 01:38:24 +0000 (-0800)
Subject: __glGetProcAddress: explictly cast function pointers to void *
X-Git-Tag: xorg-server-1.15.99.901~13
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=08c7df9b0870fadf7b4655825459ff2e5a5c47da;p=platform%2Fupstream%2Fxorg-server.git

__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 <alan.coopersmith@oracle.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
---

diff --git a/glx/glxext.c b/glx/glxext.c
index 6a34ac2..c9b8cc5 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;
 }
 
 /*