[MPlayer-cvslog] CVS: main vobsub.c,1.40,1.41

[Sascha Sommer CVS]

CVS change done by Sascha Sommer CVS

Update of /cvsroot/mplayer/main
In directory mail:/var2/tmp/cvs-serv3015

Modified Files:
	vobsub.c 
Log Message:
avoid conflicting types error on cygwin

Index: vobsub.c
===================================================================
RCS file: /cvsroot/mplayer/main/vobsub.c,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- vobsub.c	25 Dec 2004 12:08:33 -0000	1.40
+++ vobsub.c	2 Feb 2006 12:01:40 -0000	1.41
@@ -227,7 +227,7 @@
 /**********************************************************************/
 
 static ssize_t
-getline(char **lineptr, size_t *n, rar_stream_t *stream)
+vobsub_getline(char **lineptr, size_t *n, rar_stream_t *stream)
 {
     size_t res = 0;
     int c;
@@ -949,7 +949,7 @@
 	size_t line_reserve = 0;
 	char *line = NULL;
     do {
-	line_size = getline(&line, &line_reserve, fd);
+	line_size = vobsub_getline(&line, &line_reserve, fd);
 	if (line_size < 0) {
 	    break;
 	}