summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-10-15 07:12:27 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-10-15 07:12:27 +0000
commit94715a868a8ea45ec23cbda1ab76e068d8d362ec (patch)
treec12000c552d2ab977ebadb60076e9ab19bc5d94c
parentc436b4658f3098427bd586db7bd105ffa5f769a2 (diff)
merge revision(s) 47819: [Backport #9914]
* configure.in: Fix typo. [Bug #9914] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@47933 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--configure.in2
-rw-r--r--version.h2
3 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 38579c54c9..35cb774e77 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Wed Oct 15 16:12:11 2014 Rei Odaira <Rei.Odaira@gmail.com>
+
+ * configure.in: Fix typo. [Bug #9914]
+
Wed Oct 15 16:05:47 2014 NAKAMURA Usaku <usa@ruby-lang.org>
* error.c: update exception tree. [DOC]
diff --git a/configure.in b/configure.in
index 6afae13501..839c20c6eb 100644
--- a/configure.in
+++ b/configure.in
@@ -1010,7 +1010,7 @@ AS_CASE(["$target_os"],
[
# AIX currently does not support a 32-bit call to posix_fadvise()
# if _LARGE_FILES is defined.
- ac_cv_posix_fadvise=no
+ ac_cv_func_posix_fadvise=no
])
])
diff --git a/version.h b/version.h
index 08d77b7771..c537551a53 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
#define RUBY_VERSION "2.0.0"
#define RUBY_RELEASE_DATE "2014-10-15"
-#define RUBY_PATCHLEVEL 580
+#define RUBY_PATCHLEVEL 581
#define RUBY_RELEASE_YEAR 2014
#define RUBY_RELEASE_MONTH 10