Mercurial > mplayer.hg

changeset 17527:c4fba504aa37

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
avoid conflicting types error on cygwin
author faust3
date Thu, 02 Feb 2006 12:01:40 +0000
parents b92e1224d084
children d24d147acfee
files vobsub.c
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/vobsub.c	Thu Feb 02 05:10:03 2006 +0000
+++ b/vobsub.c	Thu Feb 02 12:01:40 2006 +0000
@@ -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;
 	}