diff options
author | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-06-15 10:15:41 +0000 |
---|---|---|
committer | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-06-15 10:15:41 +0000 |
commit | 356a958154e08b232468ab90e6a852e861a0396c (patch) | |
tree | e170278b00596671d8332972a30c58ef76cfc2ea | |
parent | b862aa9e4abcf5a9fdcc97d5809085d46e05cc39 (diff) |
merge revision(s) 15477:
* configure.in (ftruncate): check if available.
* file.c (rb_file_truncate): check if ftruncate instead of truncate.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@17173 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | configure.in | 2 | ||||
-rw-r--r-- | file.c | 2 | ||||
-rw-r--r-- | version.h | 2 |
4 files changed, 9 insertions, 3 deletions
@@ -1,3 +1,9 @@ +Sun Jun 15 19:13:46 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * configure.in (ftruncate): check if available. + + * file.c (rb_file_truncate): check if ftruncate instead of truncate. + Sun Jun 15 19:02:46 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> * configure.in (sigsetmask): check when signal semantics is not POSIX. diff --git a/configure.in b/configure.in index 3bc8f7f6a1..56bc83d12d 100644 --- a/configure.in +++ b/configure.in @@ -534,7 +534,7 @@ AC_REPLACE_FUNCS(dup2 memmove strcasecmp strncasecmp strerror strftime\ strchr strstr strtoul crypt flock vsnprintf\ isnan finite isinf hypot acosh erf) AC_CHECK_FUNCS(fmod killpg wait4 waitpid syscall chroot fsync getcwd eaccess\ - truncate chsize times utimes fcntl lockf lstat symlink link\ + truncate ftruncate chsize times utimes fcntl lockf lstat symlink link\ readlink setitimer setruid seteuid setreuid setresuid\ setproctitle setrgid setegid setregid setresgid issetugid pause\ lchown lchmod getpgrp setpgrp getpgid setpgid initgroups\ @@ -3259,7 +3259,7 @@ rb_file_truncate(obj, len) f = GetWriteFile(fptr); fflush(f); fseeko(f, (off_t)0, SEEK_CUR); -#ifdef HAVE_TRUNCATE +#ifdef HAVE_FTRUNCATE if (ftruncate(fileno(f), pos) < 0) rb_sys_fail(fptr->path); #else @@ -2,7 +2,7 @@ #define RUBY_RELEASE_DATE "2008-06-15" #define RUBY_VERSION_CODE 186 #define RUBY_RELEASE_CODE 20080615 -#define RUBY_PATCHLEVEL 177 +#define RUBY_PATCHLEVEL 178 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 |