diff options
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | configure.in | 4 | ||||
| -rw-r--r-- | include/ruby/win32.h | 18 | ||||
| -rw-r--r-- | win32/Makefile.sub | 1 | ||||
| -rw-r--r-- | win32/win32.c | 32 |
5 files changed, 11 insertions, 55 deletions
@@ -1,3 +1,14 @@ +Sun May 12 16:03:41 2013 KOSAKI Motohiro <kosaki.motohiro@gmail.com> + + * configure.in: removes AC_CHECK_FUNC(fseeko, fseeko64, ftello, + ftello64). They are not used from anywhere. + + * win32/win32.c (fseeko): removes. + * win32/win32.c (rb_w32_ftello): removes. + * include/ruby/win32.h: removes declarations of rb_w32_ftello and + rb_w32_fseeko. + * win32/Makefile.sub: removes '#define HAVE_FTELLO 1'. + Sun May 12 15:51:47 2013 KOSAKI Motohiro <kosaki.motohiro@gmail.com> * configure.in: remove AC_CHECK_FUNC(close). It is not used from diff --git a/configure.in b/configure.in index faaa12254b..990ed1d3dd 100644 --- a/configure.in +++ b/configure.in @@ -1743,11 +1743,7 @@ AC_CHECK_FUNCS(fcntl) AC_CHECK_FUNCS(fdatasync) AC_CHECK_FUNCS(fmod) AC_CHECK_FUNCS(fork) -AC_CHECK_FUNCS(fseeko) -AC_CHECK_FUNCS(fseeko64) AC_CHECK_FUNCS(fsync) -AC_CHECK_FUNCS(ftello) -AC_CHECK_FUNCS(ftello64) AC_CHECK_FUNCS(ftruncate) AC_CHECK_FUNCS(ftruncate64) AC_CHECK_FUNCS(getcwd) diff --git a/include/ruby/win32.h b/include/ruby/win32.h index fe8613f299..8a1bf6fb8a 100644 --- a/include/ruby/win32.h +++ b/include/ruby/win32.h @@ -385,8 +385,6 @@ scalb(double a, long b) extern int rb_w32_ftruncate(int fd, off_t length); extern int rb_w32_truncate(const char *path, off_t length); -extern off_t rb_w32_ftello(FILE *stream); -extern int rb_w32_fseeko(FILE *stream, off_t offset, int whence); #undef HAVE_FTRUNCATE #define HAVE_FTRUNCATE 1 @@ -404,22 +402,6 @@ extern int rb_w32_fseeko(FILE *stream, off_t offset, int whence); #define truncate rb_w32_truncate #endif -#undef HAVE_FSEEKO -#define HAVE_FSEEKO 1 -#if defined HAVE_FSEEKO64 -#define fseeko fseeko64 -#else -#define fseeko rb_w32_fseeko -#endif - -#undef HAVE_FTELLO -#define HAVE_FTELLO 1 -#if defined HAVE_FTELLO64 -#define ftello ftello64 -#else -#define ftello rb_w32_ftello -#endif - /* * stubs */ diff --git a/win32/Makefile.sub b/win32/Makefile.sub index 70d27d6816..f7771616bc 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -656,7 +656,6 @@ $(CONFIG_H): $(MKFILES) $(srcdir)/win32/Makefile.sub $(win_srcdir)/Makefile.sub #define HAVE_TRUNCATE 1 #define HAVE_FTRUNCATE 1 #define HAVE_FSEEKO 1 -#define HAVE_FTELLO 1 #define HAVE_TIMES 1 #define HAVE_FCNTL 1 #define HAVE_LINK 1 diff --git a/win32/win32.c b/win32/win32.c index 002535bdc9..6615437cb9 100644 --- a/win32/win32.c +++ b/win32/win32.c @@ -4889,38 +4889,6 @@ _lseeki64(int fd, off_t offset, int whence) #endif /* License: Ruby's */ -int -fseeko(FILE *stream, off_t offset, int whence) -{ - off_t pos; - switch (whence) { - case SEEK_CUR: - if (fgetpos(stream, (fpos_t *)&pos)) - return -1; - pos += offset; - break; - case SEEK_END: - if ((pos = _filelengthi64(fileno(stream))) == (off_t)-1) - return -1; - pos += offset; - break; - default: - pos = offset; - break; - } - return fsetpos(stream, (fpos_t *)&pos); -} - -/* License: Ruby's */ -off_t -rb_w32_ftello(FILE *stream) -{ - off_t pos; - if (fgetpos(stream, (fpos_t *)&pos)) return (off_t)-1; - return pos; -} - -/* License: Ruby's */ static long filetime_to_clock(FILETIME *ft) { |