1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* configure.in: removes AC_CHECK_FUNC(ftruncate64).

Browse Source 
* configure.in: adds RUBY_REPLACE_TYPE(off_t) for creating
  NUM2OFFT.
* file.c (rb_file_truncate): use correct type. chsize() take
  a long.
* include/ruby/ruby.h (NUM2OFFT): use a definition created by
  a configure script by default.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@40662 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
kosaki 2013-05-12 08:41:24 +00:00
parent e79f790798
commit 05628d3b6d
4 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,12 @@
Sun May 12 16:31:27 2013 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
* configure.in: adds RUBY_REPLACE_TYPE(off_t) for creating
NUM2OFFT.
* file.c (rb_file_truncate): use correct type. chsize() take
a long.
* include/ruby/ruby.h (NUM2OFFT): use a definition created by
a configure script by default.
Sun May 12 16:03:41 2013 KOSAKI Motohiro <kosaki.motohiro@gmail.com> Sun May 12 16:03:41 2013 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
* configure.in: removes AC_CHECK_FUNC(fseeko, fseeko64, ftello, * configure.in: removes AC_CHECK_FUNC(fseeko, fseeko64, ftello,

3
configure.in
View File

@ -1246,6 +1246,7 @@ RUBY_REPLACE_TYPE(rlim_t, [int long "long long"], RLIM, [
@%:@endif @%:@endif
@%:@include <sys/resource.h> @%:@include <sys/resource.h>
]) ])
RUBY_REPLACE_TYPE(off_t, [], OFFT)
AC_CACHE_CHECK(for prototypes, rb_cv_have_prototypes, AC_CACHE_CHECK(for prototypes, rb_cv_have_prototypes,
[AC_TRY_COMPILE([int foo(int x) { return 0; }], [return foo(10);], [AC_TRY_COMPILE([int foo(int x) { return 0; }], [return foo(10);],
@ -1745,7 +1746,7 @@ AC_CHECK_FUNCS(fmod)
AC_CHECK_FUNCS(fork) AC_CHECK_FUNCS(fork)
AC_CHECK_FUNCS(fsync) AC_CHECK_FUNCS(fsync)
AC_CHECK_FUNCS(ftruncate) AC_CHECK_FUNCS(ftruncate)
AC_CHECK_FUNCS(ftruncate64) AC_CHECK_FUNCS(ftruncate64) # used for Win32 platform
AC_CHECK_FUNCS(getcwd) AC_CHECK_FUNCS(getcwd)
AC_CHECK_FUNCS(getgrnam_r) AC_CHECK_FUNCS(getgrnam_r)
AC_CHECK_FUNCS(getgroups) AC_CHECK_FUNCS(getgroups)

9
file.c
View File

@ -4147,10 +4147,16 @@ static VALUE
rb_file_truncate(VALUE obj, VALUE len) rb_file_truncate(VALUE obj, VALUE len)
{ {
rb_io_t *fptr; rb_io_t *fptr;
#if defined(HAVE_FTRUNCATE)
#define NUM2POS(n) NUM2OFFT(n)
off_t pos; off_t pos;
#else
#define NUM2POS(n) NUM2LONG(n)
long pos;
#endif
rb_secure(2); rb_secure(2);
pos = NUM2OFFT(len); pos = NUM2POS(len);
GetOpenFile(obj, fptr); GetOpenFile(obj, fptr);
if (!(fptr->mode & FMODE_WRITABLE)) { if (!(fptr->mode & FMODE_WRITABLE)) {
rb_raise(rb_eIOError, "not opened for writing"); rb_raise(rb_eIOError, "not opened for writing");
@ -4164,6 +4170,7 @@ rb_file_truncate(VALUE obj, VALUE len)
rb_sys_fail_path(fptr->pathv); rb_sys_fail_path(fptr->pathv);
#endif #endif
return INT2FIX(0); return INT2FIX(0);
#undef NUM2POS
} }
#else #else
#define rb_file_truncate rb_f_notimplement #define rb_file_truncate rb_f_notimplement

2
include/ruby/ruby.h
View File

@ -641,11 +641,13 @@ rb_num2ll_inline(VALUE x)
# define NUM2ULL(x) rb_num2ull(x) # define NUM2ULL(x) rb_num2ull(x)
#endif #endif
#if !defined(NUM2OFFT)
# if defined(HAVE_LONG_LONG) && SIZEOF_OFF_T > SIZEOF_LONG # if defined(HAVE_LONG_LONG) && SIZEOF_OFF_T > SIZEOF_LONG
# define NUM2OFFT(x) ((off_t)NUM2LL(x)) # define NUM2OFFT(x) ((off_t)NUM2LL(x))
# else # else
# define NUM2OFFT(x) NUM2LONG(x) # define NUM2OFFT(x) NUM2LONG(x)
# endif # endif
#endif
#if defined(HAVE_LONG_LONG) && SIZEOF_SIZE_T > SIZEOF_LONG #if defined(HAVE_LONG_LONG) && SIZEOF_SIZE_T > SIZEOF_LONG
# define NUM2SIZET(x) ((size_t)NUM2ULL(x)) # define NUM2SIZET(x) ((size_t)NUM2ULL(x))