merges r30725 from trunk into ruby_1_9_2.

--
* configure.in: Mac OS X wrongly reports it has fdatasync(3).

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

3 files changed, 6 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index a02d89ee06..6092cc2042 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sun Jan 30 08:02:55 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* configure.in: Mac OS X wrongly reports it has fdatasync(3).
+
 Fri Feb 18 19:31:31 2011  Shugo Maeda  <shugo@ruby-lang.org>
 
 	* lib/fileutils.rb (FileUtils::remove_entry_secure): there is a
diff --git a/configure.in b/configure.in
index 7fba909f9d..3309c5a316 100644
--- a/configure.in
+++ b/configure.in
@@ -831,6 +831,7 @@ AS_CASE(["$target_os"],
 		fi
 		ac_cv_type_getgroups=gid_t # getgroups() on Rosetta fills garbage
 		ac_cv_lib_crypt_crypt=no
+		ac_cv_func_fdatasync=no # Mac OS 10.6 wrongly reports it has fdatasync
                 AC_CACHE_CHECK(for broken crypt with 8bit chars, rb_cv_broken_crypt,
                     [AC_TRY_RUN([
 #include <stdio.h>
diff --git a/version.h b/version.h
index fc14306a00..5d1ae3ae19 100644
--- a/version.h
+++ b/version.h
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.2"
-#define RUBY_PATCHLEVEL 180
+#define RUBY_PATCHLEVEL 181
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1