merge revision(s) 40478: [Backport #8334]

	* dir.c (dir_set_pos): Fix a compilation error when seekdir() is not
	  exist.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@40545 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 10 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 8b5f4ae3d4..abf8612847 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu May  2 00:19:46 2013  Tanaka Akira  <akr@fsij.org>
+
+	* dir.c (dir_set_pos): Fix a compilation error when seekdir() is not
+	  exist.
+
 Thu May  2 00:16:36 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* README.EXT: correct method name to be used.  [Bug #7982]
diff --git a/dir.c b/dir.c
index bc51e5025e..a46906e1af 100644
--- a/dir.c
+++ b/dir.c
@@ -689,6 +689,7 @@ dir_seek(VALUE dir, VALUE pos)
 #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)
     dir_seek(dir, pos);
     return pos;
 }
+#else
+#define dir_set_pos rb_f_notimplement
+#endif
 
 /*
  *  call-seq:
diff --git a/version.h b/version.h
index 77fbf272c3..ab3142f0ce 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
 #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