From 98a257b3a871587a97f51ef1b09800959a94ed1e Mon Sep 17 00:00:00 2001
From: pavelxdd <pavel.otchertsov@gmail.com>
Date: Fri, 25 Nov 2016 00:41:09 +0300
Subject: angle_dynamic: silence warnings during compilation If Angle is
 statically linked there were some warnings during compilation.

Fixes #3834
---
 video/out/opengl/angle_dynamic.c | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/video/out/opengl/angle_dynamic.c b/video/out/opengl/angle_dynamic.c
index 872b9f3001..1ff3cc8c6e 100644
--- a/video/out/opengl/angle_dynamic.c
+++ b/video/out/opengl/angle_dynamic.c
@@ -1,12 +1,21 @@
 #include <pthread.h>
 #include <windows.h>
 
+#ifndef ANGLE_NO_ALIASES
 #define ANGLE_NO_ALIASES
+#endif
+
 #include "angle_dynamic.h"
 
 #include "config.h"
 #include "common/common.h"
 
+#if HAVE_EGL_ANGLE_LIB
+bool angle_load(void)
+{
+    return true;
+}
+#else
 #define ANGLE_DECL(NAME, VAR) \
     VAR;
 ANGLE_FNS(ANGLE_DECL)
@@ -29,10 +38,7 @@ static void angle_do_load(void)
 
 bool angle_load(void)
 {
-#if HAVE_EGL_ANGLE_LIB
-    return true;
-#else
     pthread_once(&angle_load_once, angle_do_load);
     return angle_loaded;
-#endif
 }
+#endif
-- 
cgit v1.2.3