summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Coopersmith <alan.coopersmith@oracle.com>2014-02-03 17:38:24 -0800
committerKeith Packard <keithp@keithp.com>2014-02-07 16:14:58 -0800
commit08c7df9b0870fadf7b4655825459ff2e5a5c47da (patch)
tree27b8e172153a51808617090084c1b31e1ce28328
parent76eedb039fc8d515a76c1df944fd5a85ac674019 (diff)
__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>
-rw-r--r--glx/glxext.c4
1 files 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;
}
/*