shyouhei	2008-06-15 19:11:35 +0900 (Sun, 15 Jun 2008)

  New Revision: 17171

  Modified files:
    branches/ruby_1_8_5/ChangeLog
    branches/ruby_1_8_5/configure.in
    branches/ruby_1_8_5/file.c
    branches/ruby_1_8_5/version.h

  Log:
    merge revision(s) 15477:
    * configure.in (ftruncate): check if available.
    * file.c (rb_file_truncate): check if ftruncate instead of truncate.


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/configure.in?r1=17171&r2=17170&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/version.h?r1=17171&r2=17170&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/ChangeLog?r1=17171&r2=17170&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/file.c?r1=17171&r2=17170&diff_format=u

Index: ruby_1_8_5/configure.in
===================================================================
--- ruby_1_8_5/configure.in	(revision 17170)
+++ ruby_1_8_5/configure.in	(revision 17171)
@@ -481,7 +481,7 @@
 		 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\
Index: ruby_1_8_5/ChangeLog
===================================================================
--- ruby_1_8_5/ChangeLog	(revision 17170)
+++ ruby_1_8_5/ChangeLog	(revision 17171)
@@ -1,3 +1,9 @@
+Sun Jun 15 19:07:41 2008  Nobuyoshi Nakada  <nobu@r...>
+
+	* configure.in (ftruncate): check if available.
+
+	* file.c (rb_file_truncate): check if ftruncate instead of truncate.
+
 Sun Jun 15 18:59:04 2008  Nobuyoshi Nakada  <nobu@r...>
 
 	* configure.in (sigsetmask): check when signal semantics is not POSIX.
Index: ruby_1_8_5/version.h
===================================================================
--- ruby_1_8_5/version.h	(revision 17170)
+++ ruby_1_8_5/version.h	(revision 17171)
@@ -2,7 +2,7 @@
 #define RUBY_RELEASE_DATE "2008-06-15"
 #define RUBY_VERSION_CODE 185
 #define RUBY_RELEASE_CODE 20080615
-#define RUBY_PATCHLEVEL 176
+#define RUBY_PATCHLEVEL 177
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8
Index: ruby_1_8_5/file.c
===================================================================
--- ruby_1_8_5/file.c	(revision 17170)
+++ ruby_1_8_5/file.c	(revision 17171)
@@ -3245,7 +3245,7 @@
     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

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/