merge revision(s) r47819: [Backport ruby#9914]

nagachika · nagachika · commit 9ecfc87fa52f · 2014-10-15T14:08:15.000Z
* configure.in: Fix typo. [Bug ruby#9914] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@47945 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,7 @@
+Wed Oct 15 23:08:02 2014  Rei Odaira  <Rei.Odaira@gmail.com>
+
+	* configure.in: Fix typo. [Bug #9914]
+
 Wed Oct 15 22:46:52 2014  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* error.c: update exception tree. [DOC]
diff --git a/configure.in b/configure.in
@@ -1165,7 +1165,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
@@ -1,6 +1,6 @@
 #define RUBY_VERSION "2.1.4"
 #define RUBY_RELEASE_DATE "2014-10-15"
-#define RUBY_PATCHLEVEL 248
+#define RUBY_PATCHLEVEL 249
 
 #define RUBY_RELEASE_YEAR 2014
 #define RUBY_RELEASE_MONTH 10

-Original file line number
+Diff line change
@@ @@ -1,3 +1,7 @@ @@
 +Wed Oct 15 23:08:02 2014  Rei Odaira  <[email protected]>
++
 +	* configure.in: Fix typo. [Bug #9914]
++
 Wed Oct 15 22:46:52 2014  NAKAMURA Usaku  <[email protected]>
 	* error.c: update exception tree. [DOC]
Original file line number	Diff line number	Diff line change
`@@ -1165,7 +1165,7 @@ AS_CASE(["$target_os"],`
`1165`	`1165`	`[`
`1166`	`1166`	`# AIX currently does not support a 32-bit call to posix_fadvise()`
`1167`	`1167`	`# if _LARGE_FILES is defined.`
`1168`		`- ac_cv_posix_fadvise=no`
	`1168`	`+ ac_cv_func_posix_fadvise=no`
`1169`	`1169`	`])`
`1170`	`1170`	`])`
`1171`	`1171`