[PATCH 5/8] glx: Untangle the prototypes around the GetProcAddress thunk

[Adam Jackson]

Signed-off-by: Adam Jackson <ajax at redhat.com>
---
 glx/glxext.c    | 4 ++--
 glx/glxserver.h | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/glx/glxext.c b/glx/glxext.c
index 3a7de28..3f5758e 100644
--- a/glx/glxext.c
+++ b/glx/glxext.c
@@ -541,10 +541,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 5e29abb..fa439c2 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 *);
 
 /*
-- 
1.8.4.2