From c1e87433e52d66fc625f26980917c3b874df83ec Mon Sep 17 00:00:00 2001
From: omniavinco <omniavinco@gmail.com>
Date: Sat, 8 Aug 2015 02:44:38 +0900
Subject: [PATCH] Generate Sources of origin/master updated at Fri Aug  7
 17:44:38 GMT 2015

---
 include/GL/glxew.h |  6 ++----
 include/GL/wglew.h |  7 +++----
 src/glew.c         | 18 ++++++++++--------
 src/glewinfo.c     |  4 ++--
 4 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/include/GL/glxew.h b/include/GL/glxew.h
index 210996e..d803d26 100644
--- a/include/GL/glxew.h
+++ b/include/GL/glxew.h
@@ -1755,14 +1755,12 @@ GLEWAPI GLboolean GLEWAPIENTRY glxewContextIsSupported (const GLXEWContext *ctx,
 
 #else /* GLEW_MX */
 
-GLEWAPI GLenum GLEWAPIENTRY glxewContextInit ();
-GLEWAPI GLboolean GLEWAPIENTRY glxewContextIsSupported (const char *name);
+GLEWAPI GLenum GLEWAPIENTRY glxewInit ();
+GLEWAPI GLboolean GLEWAPIENTRY glxewIsSupported (const char *name);
 
 #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/include/GL/wglew.h b/include/GL/wglew.h
index ac6595f..23e4d3f 100644
--- a/include/GL/wglew.h
+++ b/include/GL/wglew.h
@@ -1434,13 +1434,12 @@ GLEWAPI GLboolean GLEWAPIENTRY wglewContextIsSupported (const WGLEWContext *ctx,
 
 #else /* GLEW_MX */
 
+GLEWAPI GLenum GLEWAPIENTRY wglewInit ();
+GLEWAPI GLboolean GLEWAPIENTRY wglewIsSupported (const char *name);
+
 #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);
-
 #endif /* GLEW_MX */
 
 GLEWAPI GLboolean GLEWAPIENTRY wglewGetExtension (const char *name);
diff --git a/src/glew.c b/src/glew.c
index b91b423..ccf7faa 100644
--- a/src/glew.c
+++ b/src/glew.c
@@ -11873,7 +11873,11 @@ GLboolean GLEWAPIENTRY wglewGetExtension (const char* name)
   return _glewSearchExtension(name, start, end);
 }
 
+#ifdef GLEW_MX
 GLenum GLEWAPIENTRY wglewContextInit (WGLEW_CONTEXT_ARG_DEF_LIST)
+#else
+GLenum GLEWAPIENTRY wglewInit (WGLEW_CONTEXT_ARG_DEF_LIST)
+#endif
 {
   GLboolean crippled;
   const GLubyte* extStart;
@@ -12878,7 +12882,11 @@ GLboolean glxewGetExtension (const char* name)
   return _glewSearchExtension(name, start, end);
 }
 
+#ifdef GLEW_MX
 GLenum glxewContextInit (GLXEW_CONTEXT_ARG_DEF_LIST)
+#else
+GLenum glxewInit (GLXEW_CONTEXT_ARG_DEF_LIST)
+#endif
 {
   int major, minor;
   const GLubyte* extStart;
@@ -13191,21 +13199,15 @@ GLboolean glewExperimental = GL_FALSE;
 
 #if !defined(GLEW_MX)
 
-#if defined(_WIN32)
-extern GLenum GLEWAPIENTRY wglewContextInit (void);
-#elif !defined(__ANDROID__) && !defined(__native_client__) && !defined(__HAIKU__) && (!defined(__APPLE__) || defined(GLEW_APPLE_GLX))
-extern GLenum GLEWAPIENTRY glxewContextInit (void);
-#endif /* _WIN32 */
-
 GLenum GLEWAPIENTRY glewInit (void)
 {
   GLenum r;
   r = glewContextInit();
   if ( r != 0 ) return r;
 #if defined(_WIN32)
-  return wglewContextInit();
+  return wglewInit();
 #elif !defined(__ANDROID__) && !defined(__native_client__) && !defined(__HAIKU__) && (!defined(__APPLE__) || defined(GLEW_APPLE_GLX)) /* _UNIX */
-  return glxewContextInit();
+  return glxewInit();
 #else
   return r;
 #endif /* _WIN32 */
diff --git a/src/glewinfo.c b/src/glewinfo.c
index 2345354..cddc63b 100644
--- a/src/glewinfo.c
+++ b/src/glewinfo.c
@@ -11557,7 +11557,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"))
@@ -11730,7 +11730,7 @@ GLboolean glewCreateContext (struct createParams *params)
     int contextAttrs[20];
     int nelems, i;
 
-    glxewContextInit();
+    glxewInit();
 
     if (!glxewGetExtension("GLX_ARB_create_context"))
       return GL_TRUE;