[vlc-commits] opengl: gl_common: remove explicit defines

[Alexandre Janniaux]

vlc | branch: master | Alexandre Janniaux <ajanni at videolabs.io> | Wed Oct  7 11:31:00 2020 +0200| [05756ed231b43e192751eeb3010e96ef346e8bbf] | committer: Alexandre Janniaux

opengl: gl_common: remove explicit defines

They are defined from the buildsystem already, leading to redefinition
warnings, and they don't make any sense if not compiling an iOS module
that need to be linked with the platform, for example when compiling the
vgl module.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=05756ed231b43e192751eeb3010e96ef346e8bbf
---

 modules/video_output/opengl/gl_common.h | 2 --
 1 file changed, 2 deletions(-)

diff --git a/modules/video_output/opengl/gl_common.h b/modules/video_output/opengl/gl_common.h
index 60f0873442..198e1b8e0b 100644
--- a/modules/video_output/opengl/gl_common.h
+++ b/modules/video_output/opengl/gl_common.h
@@ -28,11 +28,9 @@
 #ifdef __APPLE__
 # include <TargetConditionals.h>
 # if !TARGET_OS_IPHONE
-#  undef USE_OPENGL_ES2
 #  define MACOS_OPENGL
 #  include <OpenGL/gl.h>
 # else /* Force ESv2 on iOS */
-#  define USE_OPENGL_ES2
 #  include <OpenGLES/ES1/gl.h>
 #  include <OpenGLES/ES2/gl.h>
 #  include <OpenGLES/ES2/glext.h>