From 50c460df5a3c730b89c0aaf5c269a8b337be9c97 Mon Sep 17 00:00:00 2001
From: Geoffrey McRae <geoff@hostfission.com>
Date: Wed, 12 Dec 2018 16:53:30 +1100
Subject: [PATCH] [client] define GL_GLEXT_PROTOTYPES globally

---
 client/CMakeLists.txt          | 1 +
 client/decoders/yuv420.c       | 3 ---
 client/renderers/egl/model.h   | 1 -
 client/renderers/egl/shader.h  | 3 +--
 client/renderers/egl/texture.h | 1 -
 client/renderers/opengl.c      | 1 -
 6 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
index a0ce865b..7576d6c9 100644
--- a/client/CMakeLists.txt
+++ b/client/CMakeLists.txt
@@ -33,6 +33,7 @@ find_package(GMP)
 add_definitions(-D BUILD_VERSION='"${BUILD_VERSION}"')
 add_definitions(-D USE_NETTLE)
 add_definitions(-D ATOMIC_LOCKING)
+add_definitions(-D GL_GLEXT_PROTOTYPES)
 
 include_directories(
 	${PROJECT_SOURCE_DIR}
diff --git a/client/decoders/yuv420.c b/client/decoders/yuv420.c
index 3c81e8ce..e130ff41 100644
--- a/client/decoders/yuv420.c
+++ b/client/decoders/yuv420.c
@@ -26,10 +26,7 @@ Place, Suite 330, Boston, MA 02111-1307 USA
 #include <string.h>
 #include <assert.h>
 
-#define GL_GLEXT_PROTOTYPES
 #include <GL/gl.h>
-//#include <GL/glu.h>
-//#include <GL/glx.h>
 
 struct Pixel
 {
diff --git a/client/renderers/egl/model.h b/client/renderers/egl/model.h
index 4c9cd6fd..a03b9baa 100644
--- a/client/renderers/egl/model.h
+++ b/client/renderers/egl/model.h
@@ -23,7 +23,6 @@ Place, Suite 330, Boston, MA 02111-1307 USA
 #include "shader.h"
 #include "texture.h"
 
-#define GL_GLEXT_PROTOTYPES
 #include <GL/gl.h>
 
 typedef struct EGL_Model EGL_Model;
diff --git a/client/renderers/egl/shader.h b/client/renderers/egl/shader.h
index 4ccb7633..20e539c8 100644
--- a/client/renderers/egl/shader.h
+++ b/client/renderers/egl/shader.h
@@ -21,7 +21,6 @@ Place, Suite 330, Boston, MA 02111-1307 USA
 
 #include <stdbool.h>
 
-#define GL_GLEXT_PROTOTYPES
 #include <GL/gl.h>
 
 typedef struct EGL_Shader EGL_Shader;
@@ -34,4 +33,4 @@ bool egl_shader_compile(EGL_Shader * model, const char * vertex_code, size_t ver
 void egl_shader_use    (EGL_Shader * shader);
 
 void egl_shader_associate_textures(EGL_Shader * shader, const int count);
-GLint egl_shader_get_uniform_location(EGL_Shader * shader, const char * name);
+GLint egl_shader_get_uniform_location(EGL_Shader * shader, const char * name);
\ No newline at end of file
diff --git a/client/renderers/egl/texture.h b/client/renderers/egl/texture.h
index ff743381..759c8996 100644
--- a/client/renderers/egl/texture.h
+++ b/client/renderers/egl/texture.h
@@ -22,7 +22,6 @@ Place, Suite 330, Boston, MA 02111-1307 USA
 #include <stdbool.h>
 #include "shader.h"
 
-#define GL_GLEXT_PROTOTYPES
 #include <GL/gl.h>
 
 typedef struct EGL_Texture EGL_Texture;
diff --git a/client/renderers/opengl.c b/client/renderers/opengl.c
index c458879c..384fb994 100644
--- a/client/renderers/opengl.c
+++ b/client/renderers/opengl.c
@@ -26,7 +26,6 @@ Place, Suite 330, Boston, MA 02111-1307 USA
 
 #include <SDL2/SDL_ttf.h>
 
-#define GL_GLEXT_PROTOTYPES
 #include <GL/gl.h>
 #include <GL/glu.h>
 #include <GL/glx.h>