[vlc-commits] Fixed win32 compilation.

[Laurent Aimar]

vlc | branch: master | Laurent Aimar <fenrir at videolan.org> | Wed May 25 22:04:10 2011 +0200| [32792812022dd2c4e40f85d1811276489351ff92] | committer: Laurent Aimar

Fixed win32 compilation.

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

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

diff --git a/modules/video_output/msw/glwin32.c b/modules/video_output/msw/glwin32.c
index 5deec05..28be49e 100644
--- a/modules/video_output/msw/glwin32.c
+++ b/modules/video_output/msw/glwin32.c
@@ -67,7 +67,7 @@ static int            Control(vout_display_t *, int, va_list);
 static void           Manage (vout_display_t *);
 
 static void           Swap   (vlc_gl_t *);
-static void          *GetProcAddress(vlc_gl_t *, const char *);
+static void          *OurGetProcAddress(vlc_gl_t *, const char *);
 
 /**
  * It creates an OpenGL vout display.
@@ -112,7 +112,7 @@ static int Open(vlc_object_t *object)
     sys->gl.lock = NULL;
     sys->gl.unlock = NULL;
     sys->gl.swap = Swap;
-    sys->gl.getProcAddress = GetProcAddress;
+    sys->gl.getProcAddress = OurGetProcAddress;
     sys->gl.sys = vd;
 
     video_format_t fmt = vd->fmt;
@@ -230,7 +230,7 @@ static void Swap(vlc_gl_t *gl)
     SwapBuffers(vd->sys->hGLDC);
 }
 
-static void *GetProcAddress(vlc_gl_t *gl, const char *name)
+static void *OurGetProcAddress(vlc_gl_t *gl, const char *name)
 {
     return wglGetProcAddress(name);
 }