diff options
| author | pavelxdd <pavel.otchertsov@gmail.com> | 2016-11-25 00:41:09 +0300 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2016-11-25 09:49:49 +0100 |
| commit | 98a257b3a871587a97f51ef1b09800959a94ed1e (patch) | |
| tree | 9ba27bf3d7daf8484578402184f6cedc2f842a9a | |
| parent | c03a67c37c149134a25d400a62b7706386136379 (diff) | |
| download | mpv-98a257b3a871587a97f51ef1b09800959a94ed1e.tar.bz2 mpv-98a257b3a871587a97f51ef1b09800959a94ed1e.tar.xz | |
angle_dynamic: silence warnings during compilation
If Angle is statically linked there were some warnings during compilation.
Fixes #3834
| -rw-r--r-- | video/out/opengl/angle_dynamic.c | 14 |
1 files 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 |