mirror of
https://github.com/mpv-player/mpv
synced 2025-04-23 12:59:51 +02:00
Remove unused ftello() check and fallback implementation.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23798 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
parent
e9b8b6cf1a
commit
b6b143c5dc
28
configure
vendored
28
configure
vendored
@ -7128,23 +7128,6 @@ else
|
|||||||
echores "no"
|
echores "no"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echocheck "ftello()"
|
|
||||||
# if we don't have ftello use the osdep/ compatibility module
|
|
||||||
cat > $TMPC << EOF
|
|
||||||
#include <stdio.h>
|
|
||||||
#include <sys/types.h>
|
|
||||||
int main (void) { ftello(stdin); return 0; }
|
|
||||||
EOF
|
|
||||||
_ftello=no
|
|
||||||
cc_check && _ftello=yes
|
|
||||||
if test "$_ftello" = yes ; then
|
|
||||||
_def_ftello='#define HAVE_FTELLO 1'
|
|
||||||
_need_ftello=no
|
|
||||||
else
|
|
||||||
_def_ftello='#undef HAVE_FTELLO'
|
|
||||||
_need_ftello=yes
|
|
||||||
fi
|
|
||||||
echores "$_ftello"
|
|
||||||
|
|
||||||
# Dynamic linking flags
|
# Dynamic linking flags
|
||||||
# (FIXME: 'echocheck "dynamic linking"' above and modify here accordingly)
|
# (FIXME: 'echocheck "dynamic linking"' above and modify here accordingly)
|
||||||
@ -7411,7 +7394,6 @@ HAVE_XVMC_ACCEL = $_xvmc
|
|||||||
HAVE_SYS_MMAN_H = $_mman
|
HAVE_SYS_MMAN_H = $_mman
|
||||||
HAVE_POSIX_SELECT = $_posix_select
|
HAVE_POSIX_SELECT = $_posix_select
|
||||||
|
|
||||||
NEED_FTELLO = $_need_ftello
|
|
||||||
NEED_GETTIMEOFDAY = $_need_gettimeofday
|
NEED_GETTIMEOFDAY = $_need_gettimeofday
|
||||||
NEED_GLOB = $_need_glob
|
NEED_GLOB = $_need_glob
|
||||||
NEED_SCANDIR = $_need_scandir
|
NEED_SCANDIR = $_need_scandir
|
||||||
@ -7734,16 +7716,6 @@ $_def_soundcard
|
|||||||
/* Define this if your system has the sysinfo header */
|
/* Define this if your system has the sysinfo header */
|
||||||
$_def_sys_sysinfo
|
$_def_sys_sysinfo
|
||||||
|
|
||||||
/* Define this if your system has ftello() */
|
|
||||||
|
|
||||||
$_def_ftello
|
|
||||||
#ifndef HAVE_FTELLO
|
|
||||||
/* Need these for FILE and off_t an config.h is usually before other includes*/
|
|
||||||
#include <stdio.h>
|
|
||||||
#include <sys/types.h>
|
|
||||||
off_t ftello(FILE *);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/* Define this if your system has the "malloc.h" header file */
|
/* Define this if your system has the "malloc.h" header file */
|
||||||
$_def_malloc
|
$_def_malloc
|
||||||
|
|
||||||
|
@ -5,7 +5,6 @@ LIBNAME_COMMON = libosdep.a
|
|||||||
SRCS_COMMON-$(HAVE_SYS_MMAN_H) += mmap_anon.c
|
SRCS_COMMON-$(HAVE_SYS_MMAN_H) += mmap_anon.c
|
||||||
SRCS_COMMON-$(MACOSX_FINDER_SUPPORT) += macosx_finder_args.c
|
SRCS_COMMON-$(MACOSX_FINDER_SUPPORT) += macosx_finder_args.c
|
||||||
|
|
||||||
SRCS_COMMON-$(NEED_FTELLO) += ftello.c
|
|
||||||
SRCS_COMMON-$(NEED_GETTIMEOFDAY) += gettimeofday.c
|
SRCS_COMMON-$(NEED_GETTIMEOFDAY) += gettimeofday.c
|
||||||
SRCS_COMMON-$(NEED_GLOB) += glob-win.c
|
SRCS_COMMON-$(NEED_GLOB) += glob-win.c
|
||||||
SRCS_COMMON-$(NEED_SCANDIR) += scandir.c
|
SRCS_COMMON-$(NEED_SCANDIR) += scandir.c
|
||||||
|
@ -1,19 +0,0 @@
|
|||||||
/*
|
|
||||||
* ftello.c
|
|
||||||
* 64-bit version of ftello() for systems which do not have it
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include "config.h"
|
|
||||||
|
|
||||||
#include <stdio.h>
|
|
||||||
#include <sys/types.h>
|
|
||||||
|
|
||||||
off_t
|
|
||||||
ftello(FILE *stream)
|
|
||||||
{
|
|
||||||
fpos_t floc;
|
|
||||||
|
|
||||||
if (fgetpos(stream, &floc) != 0)
|
|
||||||
return -1;
|
|
||||||
return floc;
|
|
||||||
}
|
|
Loading…
x
Reference in New Issue
Block a user