summaryrefslogtreecommitdiffstats
path: root/osdep
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-01-10 19:35:41 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-01-10 19:35:41 +0000
commit7db81061d745e47e6aae1b947c7a5b40084529de (patch)
tree3fec0137acbf23e23ca343050feda1163bc8b5e4 /osdep
parentb2c4df0543c3de1725763511eca658a055209f36 (diff)
downloadmpv-7db81061d745e47e6aae1b947c7a5b40084529de.tar.bz2
mpv-7db81061d745e47e6aae1b947c7a5b40084529de.tar.xz
Split fseeko.c into fseeko.c and ftello.c, move #ifdefs into the build system.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21874 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'osdep')
-rw-r--r--osdep/Makefile3
-rw-r--r--osdep/fseeko.c19
-rw-r--r--osdep/ftello.c19
3 files changed, 22 insertions, 19 deletions
diff --git a/osdep/Makefile b/osdep/Makefile
index 9865581623..d1fee0ef78 100644
--- a/osdep/Makefile
+++ b/osdep/Makefile
@@ -4,7 +4,6 @@ include ../config.mak
LIBNAME = libosdep.a
SRCS= strl.c \
- fseeko.c \
SRCS-$(HAVE_SYS_MMAN_H) += mmap_anon.c
SRCS-$(MACOSX_FINDER_SUPPORT) += macosx_finder_args.c
@@ -12,6 +11,8 @@ ifneq ($(TARGET_OS),MINGW32)
SRCS-$(STREAM_CACHE) += shmem.c
endif
+SRCS-$(NEED_FSEEKO) += fseeko.c
+SRCS-$(NEED_FTELLO) += ftello.c
SRCS-$(NEED_GETTIMEOFDAY) += gettimeofday.c
SRCS-$(NEED_SCANDIR) += scandir.c
SRCS-$(NEED_SETENV) += setenv.c
diff --git a/osdep/fseeko.c b/osdep/fseeko.c
index decbaf5c8f..7d942a1c25 100644
--- a/osdep/fseeko.c
+++ b/osdep/fseeko.c
@@ -4,13 +4,11 @@
*/
#include "config.h"
-
-#if !defined(HAVE_FSEEKO) || !defined(HAVE_FTELLO)
+
#include <stdio.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <errno.h>
-#endif
#ifdef WIN32
#define flockfile
@@ -25,7 +23,6 @@
* This is thread-safe on BSD/OS using flockfile/funlockfile.
*/
-#ifndef HAVE_FSEEKO
int
fseeko(FILE *stream, off_t offset, int whence)
{
@@ -68,17 +65,3 @@ failure:
funlockfile(stream);
return -1;
}
-#endif
-
-
-#ifndef HAVE_FTELLO
-off_t
-ftello(FILE *stream)
-{
- fpos_t floc;
-
- if (fgetpos(stream, &floc) != 0)
- return -1;
- return floc;
-}
-#endif
diff --git a/osdep/ftello.c b/osdep/ftello.c
new file mode 100644
index 0000000000..d11710b89f
--- /dev/null
+++ b/osdep/ftello.c
@@ -0,0 +1,19 @@
+/*
+ * 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;
+}