[vlc-commits] EGL: avoid clash with Win32 API

Rémi Denis-Courmont git at videolan.org
Wed Jun 1 23:05:34 CEST 2011


vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Wed Jun  1 23:59:15 2011 +0300| [bde18225264d7e8144f7de02425d1bf1571e0b03] | committer: Rémi Denis-Courmont

EGL: avoid clash with Win32 API

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

 modules/video_output/egl.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/video_output/egl.c b/modules/video_output/egl.c
index d141bf1..881e122 100644
--- a/modules/video_output/egl.c
+++ b/modules/video_output/egl.c
@@ -70,7 +70,7 @@ typedef struct vlc_gl_sys_t
 /* OpenGL callbacks */
 static int MakeCurrent (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)
 {
@@ -194,7 +194,7 @@ static int Open (vlc_object_t *obj, const struct gl_api *api)
     gl->sys = sys;
     gl->makeCurrent = MakeCurrent;
     gl->swap = SwapBuffers;
-    gl->getProcAddress = GetProcAddress;
+    gl->getProcAddress = GetSymbol;
     gl->lock = NULL;
     gl->unlock = NULL;
     return VLC_SUCCESS;
@@ -257,7 +257,7 @@ static void SwapBuffers (vlc_gl_t *gl)
     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;
     return (void *)eglGetProcAddress (procname);



More information about the vlc-commits mailing list