summaryrefslogtreecommitdiffstats
path: root/osdep
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2014-10-18 23:40:35 +0200
committerwm4 <wm4@nowhere>2014-10-19 05:51:25 +0200
commit76af31b0eb51d50f7dc17db3fdb3cc3e40fac187 (patch)
tree73cdea4f2aca95c311503b9d8ae2eedd2b2b92ac /osdep
parent2458f0628e1d39bd6734bc0d9d842a286372089c (diff)
downloadmpv-76af31b0eb51d50f7dc17db3fdb3cc3e40fac187.tar.bz2
mpv-76af31b0eb51d50f7dc17db3fdb3cc3e40fac187.tar.xz
win32: remove an unneeded mechanism
Instead of relying on the macro-defined lseek(), just use _lseeki64 directly, and avoid a minor mess.
Diffstat (limited to 'osdep')
-rw-r--r--osdep/io.c4
-rw-r--r--osdep/io.h6
2 files changed, 3 insertions, 7 deletions
diff --git a/osdep/io.c b/osdep/io.c
index a78dd78c2c..37ea37f058 100644
--- a/osdep/io.c
+++ b/osdep/io.c
@@ -17,8 +17,6 @@
* You should have received a copy of the GNU General Public License along
* with mplayer2. If not, see <http://www.gnu.org/licenses/>.
*/
-#define MP_HIDE_IO_REPLACEMENTS
-
#include <unistd.h>
#include <errno.h>
@@ -428,7 +426,7 @@ off_t mp_lseek(int fd, off_t offset, int whence)
errno = ESPIPE;
return (off_t)-1;
}
- return lseek(fd, offset, whence);
+ return _lseeki64(fd, offset, whence);
}
#endif // __MINGW32__
diff --git a/osdep/io.h b/osdep/io.h
index 7270c28c55..ac1a0f90fa 100644
--- a/osdep/io.h
+++ b/osdep/io.h
@@ -124,15 +124,13 @@ void mp_globfree(mp_glob_t *pglob);
#define tmpfile(...) mp_tmpfile(__VA_ARGS__)
#define getenv(...) mp_getenv(__VA_ARGS__)
-// Things MinGW defines as macros, and which we want to override only for the
-// user, and not io.c (which wants the original definition).
-#ifndef MP_HIDE_IO_REPLACEMENTS
#undef lseek
#define lseek(...) mp_lseek(__VA_ARGS__)
-#endif
+// Affects both "stat()" and "struct stat".
#undef stat
#define stat mp_stat
+
#undef fstat
#define fstat(...) mp_fstat(__VA_ARGS__)