[vlc-commits] marq: avoid name conflict with Win32 API

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Thu May 10 23:05:48 2012 +0300| [b8bca1e99f96af40bdb3c654363c0b82a9c0178c] | committer: Rémi Denis-Courmont

marq: avoid name conflict with Win32 API

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

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

diff --git a/modules/video_filter/marq.c b/modules/video_filter/marq.c
index 1420456..890d99b 100644
--- a/modules/video_filter/marq.c
+++ b/modules/video_filter/marq.c
@@ -47,7 +47,7 @@ static int  CreateFilter ( vlc_object_t * );
 static void DestroyFilter( vlc_object_t * );
 static subpicture_t *Filter( filter_t *, mtime_t );
 
-static char *ReadFile( filter_t *, const char * );
+static char *MarqueeReadFile( filter_t *, const char * );
 static int MarqueeCallback( vlc_object_t *p_this, char const *psz_var,
                             vlc_value_t oldval, vlc_value_t newval,
                             void *p_data );
@@ -283,7 +283,7 @@ static subpicture_t *Filter( filter_t *p_filter, mtime_t date )
 
     if( p_sys->filepath != NULL )
     {
-        char *fmt = ReadFile( p_filter, p_sys->filepath );
+        char *fmt = MarqueeReadFile( p_filter, p_sys->filepath );
         if( fmt != NULL )
         {
             free( p_sys->format );
@@ -348,7 +348,7 @@ out:
     return p_spu;
 }
 
-static char *ReadFile( filter_t *obj, const char *path )
+static char *MarqueeReadFile( filter_t *obj, const char *path )
 {
     FILE *stream = vlc_fopen( path, "rt" );
     if( stream == NULL )