summaryrefslogtreecommitdiffstats
path: root/vobsub.c
diff options
context:
space:
mode:
authorfaust3 <faust3@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-02-02 12:01:40 +0000
committerfaust3 <faust3@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-02-02 12:01:40 +0000
commit06f0cd68936479f1b8040ce9a962bdb814c77fc5 (patch)
tree7c2c6925acf2cb534d2e85ff0e793e5d895df55e /vobsub.c
parentaddfc4c6a7b9603bb7e75a6aedafa3b1d44b682e (diff)
downloadmpv-06f0cd68936479f1b8040ce9a962bdb814c77fc5.tar.bz2
mpv-06f0cd68936479f1b8040ce9a962bdb814c77fc5.tar.xz
avoid conflicting types error on cygwin
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17528 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'vobsub.c')
-rw-r--r--vobsub.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/vobsub.c b/vobsub.c
index b6d06106f3..245f431dde 100644
--- a/vobsub.c
+++ b/vobsub.c
@@ -227,7 +227,7 @@ typedef FILE rar_stream_t;
/**********************************************************************/
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 @@ vobsub_parse_one_line(vobsub_t *vob, rar_stream_t *fd)
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;
}