From 08806061a4b00d285c7f3c488ac6ccc6ecc6fb71 Mon Sep 17 00:00:00 2001
From: Nigel Stewart <nigels@users.sourceforge.net>
Date: Fri, 7 Aug 2015 16:41:04 +1000
Subject: [PATCH] Refactoring wglewInit, glxewInit for better consistency.

---
 auto/src/glew_str_glx.c  |  2 +-
 auto/src/glew_str_wgl.c  |  2 +-
 auto/src/glewinfo_tail.c |  4 ++--
 auto/src/glxew_tail.h    |  5 +++--
 auto/src/wglew_tail.h    | 10 ++++++----
 5 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/auto/src/glew_str_glx.c b/auto/src/glew_str_glx.c
index e841475..81827a6 100644
--- a/auto/src/glew_str_glx.c
+++ b/auto/src/glew_str_glx.c
@@ -9,7 +9,7 @@
 #if defined(GLEW_MX)
 GLboolean glxewContextIsSupported (const GLXEWContext* ctx, const char* name)
 #else
-GLboolean glxewIsSupported (const char* name)
+GLboolean glxewContextIsSupported (const char* name)
 #endif
 {
   const GLubyte* pos = (const GLubyte*)name;
diff --git a/auto/src/glew_str_wgl.c b/auto/src/glew_str_wgl.c
index 5463ef7..b4c1ca2 100644
--- a/auto/src/glew_str_wgl.c
+++ b/auto/src/glew_str_wgl.c
@@ -9,7 +9,7 @@
 #if defined(GLEW_MX)
 GLboolean GLEWAPIENTRY wglewContextIsSupported (const WGLEWContext* ctx, const char* name)
 #else
-GLboolean GLEWAPIENTRY wglewIsSupported (const char* name)
+GLboolean GLEWAPIENTRY wglewContextIsSupported (const char* name)
 #endif
 {
   const GLubyte* pos = (const GLubyte*)name;
diff --git a/auto/src/glewinfo_tail.c b/auto/src/glewinfo_tail.c
index 8aed4d3..a5e9232 100644
--- a/auto/src/glewinfo_tail.c
+++ b/auto/src/glewinfo_tail.c
@@ -195,7 +195,7 @@ GLboolean glewCreateContext (struct createParams* params)
     int contextAttrs[20];
     int i;
 
-    wglewContextInit();
+    wglewInit();
 
     /* Intel HD 3000 has WGL_ARB_create_context, but not WGL_ARB_create_context_profile */
     if (!wglewGetExtension("WGL_ARB_create_context"))
@@ -368,7 +368,7 @@ GLboolean glewCreateContext (struct createParams *params)
     int contextAttrs[20];
     int nelems, i;
 
-    glxewContextInit();
+    glxewInit();
 
     if (!glxewGetExtension("GLX_ARB_create_context"))
       return GL_TRUE;
diff --git a/auto/src/glxew_tail.h b/auto/src/glxew_tail.h
index ddffffb..0b4518e 100644
--- a/auto/src/glxew_tail.h
+++ b/auto/src/glxew_tail.h
@@ -17,11 +17,12 @@ GLEWAPI GLboolean GLEWAPIENTRY glxewContextIsSupported (const GLXEWContext *ctx,
 GLEWAPI GLenum GLEWAPIENTRY glxewContextInit ();
 GLEWAPI GLboolean GLEWAPIENTRY glxewContextIsSupported (const char *name);
 
+#define glxewInit() glxewContextInit()
+#define glxewIsSupported(x) glxewContextIsSupported(x)
+
 #define GLXEW_GET_VAR(x) (*(const GLboolean*)&x)
 #define GLXEW_GET_FUN(x) x
 
-GLEWAPI GLboolean GLEWAPIENTRY glxewIsSupported (const char *name);
-
 #endif /* GLEW_MX */
 
 GLEWAPI GLboolean GLEWAPIENTRY glxewGetExtension (const char *name);
diff --git a/auto/src/wglew_tail.h b/auto/src/wglew_tail.h
index 0e38466..7955925 100644
--- a/auto/src/wglew_tail.h
+++ b/auto/src/wglew_tail.h
@@ -14,12 +14,14 @@ GLEWAPI GLboolean GLEWAPIENTRY wglewContextIsSupported (const WGLEWContext *ctx,
 
 #else /* GLEW_MX */
 
-#define WGLEW_GET_VAR(x) (*(const GLboolean*)&x)
-#define WGLEW_GET_FUN(x) x
-
 GLEWAPI GLenum GLEWAPIENTRY wglewContextInit ();
 GLEWAPI GLboolean GLEWAPIENTRY wglewContextIsSupported (const char *name);
-GLEWAPI GLboolean GLEWAPIENTRY wglewIsSupported (const char *name);
+
+#define wglewInit() wglewContextInit()
+#define wglewIsSupported(x) wglewContextIsSupported(x)
+
+#define WGLEW_GET_VAR(x) (*(const GLboolean*)&x)
+#define WGLEW_GET_FUN(x) x
 
 #endif /* GLEW_MX */