mirror of
https://github.com/mpv-player/mpv
synced 2024-11-03 03:19:24 +01:00
avoid conflicting types error on cygwin
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17528 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
parent
addfc4c6a7
commit
06f0cd6893
4
vobsub.c
4
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;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user