From bf6279bc2b7e181118caa0b0e58e2220856f0ec9 Mon Sep 17 00:00:00 2001 From: akr Date: Tue, 18 Feb 2014 03:13:04 +0000 Subject: [PATCH] * configure.in (FILE_COUNT): Removed. (win32.c defines it in itself.) (FILE_READPTR): Ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@45031 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ configure.in | 40 ---------------------------------------- 2 files changed, 5 insertions(+), 40 deletions(-) diff --git a/ChangeLog b/ChangeLog index f231763da8..3b06639623 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Tue Feb 18 12:06:39 2014 Tanaka Akira + + * configure.in (FILE_COUNT): Removed. (win32.c defines it in itself.) + (FILE_READPTR): Ditto. + Tue Feb 18 09:35:44 2014 SHIBATA Hiroshi * test/test/psych/test_string.rb: remove unused variables. diff --git a/configure.in b/configure.in index b04aec6ad0..0b54a518cd 100644 --- a/configure.in +++ b/configure.in @@ -2317,46 +2317,6 @@ else AC_DEFINE(RSHIFT(x,y), (((x)<0) ? ~((~(x))>>(int)(y)) : (x)>>(int)(y))) fi -# win32.c still use this. Don't remove it. -test "$rb_cv_fcnt" = "not found" && rb_cv_fcnt="not found (OK if using GNU libc)" -AC_CACHE_CHECK([read count field in FILE structures], rb_cv_fcnt, -[rb_cv_fcnt="not found (OK if using GNU libc)" -for fcnt in dnl - _cnt dnl - __cnt dnl - _r dnl - readCount dnl - _rcount dnl for emx0.9c -; do - AC_TRY_COMPILE([#include -], - [FILE *f = stdin; f->$fcnt = 0;], - [rb_cv_fcnt="$fcnt"; break]) -done]) -AS_CASE("$rb_cv_fcnt", - ["not found"*], [rb_cv_fcnt="not found"], - [AC_DEFINE_UNQUOTED(FILE_COUNT, $rb_cv_fcnt)]) - -# win32.c still use this. Don't remove it. -AC_CACHE_CHECK([read buffer ptr field in FILE structures], rb_cv_frptr, -[for frptr in dnl - _IO_read_ptr dnl - _ptr dnl - __ptr dnl - bufpos dnl - _p dnl - __bufpos dnl -; do - AC_TRY_COMPILE([#include -], - [FILE *f = stdin; char buf[256]; f->$frptr = buf;], - rb_cv_frptr="$frptr"; break, - rb_cv_frptr="not found") -done]) -if test "$rb_cv_frptr" != "not found"; then - AC_DEFINE_UNQUOTED(FILE_READPTR, $rb_cv_frptr) -fi - if test x"$ac_cv_func_gettimeofday" != xyes; then AC_MSG_ERROR(gettimeofday() must exist) fi