nagachika	2013-05-02 00:20:10 +0900 (Thu, 02 May 2013)

  New Revision: 40545

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

  Log:
    merge revision(s) 40478: [Backport #8334]
    
    * dir.c (dir_set_pos): Fix a compilation error when seekdir() is not
      exist.

  Modified directories:
    branches/ruby_2_0_0/
  Modified files:
    branches/ruby_2_0_0/ChangeLog
    branches/ruby_2_0_0/dir.c
    branches/ruby_2_0_0/version.h

Index: ruby_2_0_0/ChangeLog
===================================================================
--- ruby_2_0_0/ChangeLog	(revision 40544)
+++ ruby_2_0_0/ChangeLog	(revision 40545)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ChangeLog#L1
+Thu May  2 00:19:46 2013  Tanaka Akira  <akr@f...>
+
+	* dir.c (dir_set_pos): Fix a compilation error when seekdir() is not
+	  exist.
+
 Thu May  2 00:16:36 2013  Nobuyoshi Nakada  <nobu@r...>
 
 	* README.EXT: correct method name to be used.  [Bug #7982]
Index: ruby_2_0_0/dir.c
===================================================================
--- ruby_2_0_0/dir.c	(revision 40544)
+++ ruby_2_0_0/dir.c	(revision 40545)
@@ -689,6 +689,7 @@ dir_seek(VALUE dir, VALUE pos) https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/dir.c#L689
 #define dir_seek rb_f_notimplement
 #endif
 
+#ifdef HAVE_SEEKDIR
 /*
  *  call-seq:
  *     dir.pos( integer ) -> integer
@@ -709,6 +710,9 @@ dir_set_pos(VALUE dir, VALUE pos) https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/dir.c#L710
     dir_seek(dir, pos);
     return pos;
 }
+#else
+#define dir_set_pos rb_f_notimplement
+#endif
 
 /*
  *  call-seq:
Index: ruby_2_0_0/version.h
===================================================================
--- ruby_2_0_0/version.h	(revision 40544)
+++ ruby_2_0_0/version.h	(revision 40545)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/version.h#L1
 #define RUBY_VERSION "2.0.0"
 #define RUBY_RELEASE_DATE "2013-05-02"
-#define RUBY_PATCHLEVEL 178
+#define RUBY_PATCHLEVEL 179
 
 #define RUBY_RELEASE_YEAR 2013
 #define RUBY_RELEASE_MONTH 5

Property changes on: ruby_2_0_0
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r40478


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