From eef67ee0cda98af45e9ef7c54a95cdc7a90ac23f Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Sat, 24 Nov 2018 00:37:07 +0100
Subject: [PATCH] Get rid of the header guards in
 shaders_common.h/glsl_common.h

---
 gfx/drivers/gl_shaders/glsl/frag/shaders_common.h | 7 ++-----
 gfx/drivers/gl_shaders/glsl/glsl_common.h         | 9 +++++----
 gfx/drivers/gl_shaders/glsl/vert/shaders_common.h | 8 +++-----
 3 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/gfx/drivers/gl_shaders/glsl/frag/shaders_common.h b/gfx/drivers/gl_shaders/glsl/frag/shaders_common.h
index 655861381c..23bd261f07 100644
--- a/gfx/drivers/gl_shaders/glsl/frag/shaders_common.h
+++ b/gfx/drivers/gl_shaders/glsl/frag/shaders_common.h
@@ -1,6 +1,3 @@
-#ifndef _SHADERS_COMMON
-#define _SHADERS_COMMON
-
+#undef VERTEX
+#define FRAGMENT
 #include "../glsl_common.h"
-
-#endif
diff --git a/gfx/drivers/gl_shaders/glsl/glsl_common.h b/gfx/drivers/gl_shaders/glsl/glsl_common.h
index 0c9640a08b..36e0c06cd7 100644
--- a/gfx/drivers/gl_shaders/glsl/glsl_common.h
+++ b/gfx/drivers/gl_shaders/glsl/glsl_common.h
@@ -1,5 +1,8 @@
-#ifndef _SHADERS_COMMON
-#define _SHADERS_COMMON
+#undef GLSL_DERIV_PREAMBLE
+#undef GLSL_PREAMBLE
+#undef GLSL
+#undef GLSL_300
+#undef GLSL_330
 
 #define GLSL_DERIV_PREAMBLE() "#extension GL_OES_standard_derivatives : enable\n"
 #define GLSL_PREAMBLE() \
@@ -21,5 +24,3 @@
 #define GLSL_300(src)   "#version 300 es\n" GLSL_PREAMBLE() #src
 #define GLSL_330(src)   "#version 330 core\n" GLSL_PREAMBLE() #src
 #endif
-
-#endif
diff --git a/gfx/drivers/gl_shaders/glsl/vert/shaders_common.h b/gfx/drivers/gl_shaders/glsl/vert/shaders_common.h
index 655861381c..60d4782bee 100644
--- a/gfx/drivers/gl_shaders/glsl/vert/shaders_common.h
+++ b/gfx/drivers/gl_shaders/glsl/vert/shaders_common.h
@@ -1,6 +1,4 @@
-#ifndef _SHADERS_COMMON
-#define _SHADERS_COMMON
-
+#undef FRAGMENT
+#undef VERTEX
+#define VERTEX
 #include "../glsl_common.h"
-
-#endif