Skip to content

V
vlc-2-2
Commit bde18225 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files
Options

EGL: avoid clash with Win32 API

parent 6f1f23fb
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
modules/video_output/egl.c
View file @ bde18225
...@@ -70,7 +70,7 @@ typedef struct vlc_gl_sys_t ...@@ -70,7 +70,7 @@ typedef struct vlc_gl_sys_t
/* OpenGL callbacks */ /* OpenGL callbacks */
static int MakeCurrent (vlc_gl_t *); static int MakeCurrent (vlc_gl_t *);
static void SwapBuffers (vlc_gl_t *); static void SwapBuffers (vlc_gl_t *);
static void *GetProcAddress(vlc_gl_t *, const char *); static void *GetSymbol(vlc_gl_t *, const char *);
static bool CheckAPI (EGLDisplay dpy, const char *api) static bool CheckAPI (EGLDisplay dpy, const char *api)
{ {
...@@ -194,7 +194,7 @@ static int Open (vlc_object_t *obj, const struct gl_api *api) ...@@ -194,7 +194,7 @@ static int Open (vlc_object_t *obj, const struct gl_api *api)
gl->sys = sys; gl->sys = sys;
gl->makeCurrent = MakeCurrent; gl->makeCurrent = MakeCurrent;
gl->swap = SwapBuffers; gl->swap = SwapBuffers;
gl->getProcAddress = GetProcAddress; gl->getProcAddress = GetSymbol;
gl->lock = NULL; gl->lock = NULL;
gl->unlock = NULL; gl->unlock = NULL;
return VLC_SUCCESS; return VLC_SUCCESS;
...@@ -257,7 +257,7 @@ static void SwapBuffers (vlc_gl_t *gl) ...@@ -257,7 +257,7 @@ static void SwapBuffers (vlc_gl_t *gl)
eglSwapBuffers (sys->display, sys->surface); eglSwapBuffers (sys->display, sys->surface);
} }
static void *GetProcAddress(vlc_gl_t *gl, const char *procname) static void *GetSymbol(vlc_gl_t *gl, const char *procname)
{ {
(void) gl; (void) gl;
return (void *)eglGetProcAddress (procname); return (void *)eglGetProcAddress (procname);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment