[前][次][番号順一覧][スレッド一覧]

ruby-changes:19754

From: yugui <ko1@a...>
Date: Mon, 30 May 2011 07:54:00 +0900 (JST)
Subject: [ruby-changes:19754] yugui:r31801 (ruby_1_9_2): merges r31277 from trunk into ruby_1_9_2.

yugui	2011-05-30 07:49:55 +0900 (Mon, 30 May 2011)

  New Revision: 31801

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=31801

  Log:
    merges r31277 from trunk into ruby_1_9_2.
    --
    * include/ruby/win32.h (ftruncate, truncate): mingw64 misses
      prototypes.

  Modified files:
    branches/ruby_1_9_2/ChangeLog
    branches/ruby_1_9_2/include/ruby/win32.h
    branches/ruby_1_9_2/version.h

Index: ruby_1_9_2/include/ruby/win32.h
===================================================================
--- ruby_1_9_2/include/ruby/win32.h	(revision 31800)
+++ ruby_1_9_2/include/ruby/win32.h	(revision 31801)
@@ -373,13 +373,13 @@
 
 #if !defined HAVE_FTRUNCATE || defined(_MSC_VER)
 #define ftruncate rb_w32_ftruncate
-extern int       rb_w32_ftruncate(int fd, off_t length);
 #endif
+extern int       ftruncate(int fd, off_t length);
 
 #if !defined HAVE_TRUNCATE || defined(_MSC_VER)
 #define truncate rb_w32_truncate
-extern int       rb_w32_truncate(const char *path, off_t length);
 #endif
+extern int       truncate(const char *path, off_t length);
 
 extern int       fseeko(FILE *stream, off_t offset, int whence);
 
Index: ruby_1_9_2/ChangeLog
===================================================================
--- ruby_1_9_2/ChangeLog	(revision 31800)
+++ ruby_1_9_2/ChangeLog	(revision 31801)
@@ -1,3 +1,8 @@
+Thu Apr 14 21:21:01 2011  Nobuyoshi Nakada  <nobu@r...>
+
+	* include/ruby/win32.h (ftruncate, truncate): mingw64 misses
+	  prototypes.
+
 Thu Apr 14 16:01:45 2011  Kazuhiro NISHIYAMA  <zn@m...>
 
 	* io.c (rb_f_syscall): reduce warning: "HAVE___SYSCALL" is not defined.
Index: ruby_1_9_2/version.h
===================================================================
--- ruby_1_9_2/version.h	(revision 31800)
+++ ruby_1_9_2/version.h	(revision 31801)
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.2"
-#define RUBY_PATCHLEVEL 228
+#define RUBY_PATCHLEVEL 229
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1

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

[前][次][番号順一覧][スレッド一覧]