summaryrefslogtreecommitdiff
path: root/glx
diff options
context:
space:
mode:
authorAdam Jackson <ajax@redhat.com>2013-12-03 15:01:44 -0500
committerKeith Packard <keithp@keithp.com>2013-12-10 08:03:50 -0800
commit47f00b3920be9d8df8b148263d744934f3a02cd4 (patch)
tree7e61ddf04246797bb9b31b6261e917bcbcba0fb6 /glx
parentc1fd143f2847ef425ec9891d9e1cba44a1bb007d (diff)
glx: Untangle the prototypes around the GetProcAddress thunk
Signed-off-by: Adam Jackson <ajax@redhat.com> Reviewed-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com> Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Diffstat (limited to 'glx')
-rw-r--r--glx/glxext.c4
-rw-r--r--glx/glxserver.h4
2 files changed, 5 insertions, 3 deletions
diff --git a/glx/glxext.c b/glx/glxext.c
index 601d08afd..84ac43dca 100644
--- a/glx/glxext.c
+++ b/glx/glxext.c
@@ -544,10 +544,10 @@ __glXleaveServer(GLboolean rendering)
glxServerLeaveCount++;
}
-static void (*(*_get_proc_address)(const char *))(void);
+static glx_gpa_proc _get_proc_address;
void
-__glXsetGetProcAddress(void (*(*get_proc_address) (const char *))(void))
+__glXsetGetProcAddress(glx_gpa_proc get_proc_address)
{
_get_proc_address = get_proc_address;
}
diff --git a/glx/glxserver.h b/glx/glxserver.h
index f862b6360..7f36e5f5e 100644
--- a/glx/glxserver.h
+++ b/glx/glxserver.h
@@ -117,7 +117,9 @@ void __glXleaveServer(GLboolean rendering);
void glxSuspendClients(void);
void glxResumeClients(void);
-void __glXsetGetProcAddress(void (*(*get_proc_address) (const char *)) (void));
+typedef void (*glx_func_ptr)(void);
+typedef glx_func_ptr (*glx_gpa_proc)(const char *);
+void __glXsetGetProcAddress(glx_gpa_proc get_proc_address);
void *__glGetProcAddress(const char *);
void