nagachika	2014-10-15 23:08:15 +0900 (Wed, 15 Oct 2014)

  New Revision: 47945

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

  Log:
    merge revision(s) r47819: [Backport #9914]
    
    * configure.in: Fix typo. [Bug #9914]

  Modified directories:
    branches/ruby_2_1/
  Modified files:
    branches/ruby_2_1/ChangeLog
    branches/ruby_2_1/configure.in
    branches/ruby_2_1/version.h
Index: ruby_2_1/configure.in
===================================================================
--- ruby_2_1/configure.in	(revision 47944)
+++ ruby_2_1/configure.in	(revision 47945)
@@ -1165,7 +1165,7 @@ AS_CASE(["$target_os"], https://github.com/ruby/ruby/blob/trunk/ruby_2_1/configure.in#L1165
 	[
 	    # 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
 	])
     ])
 
Index: ruby_2_1/ChangeLog
===================================================================
--- ruby_2_1/ChangeLog	(revision 47944)
+++ ruby_2_1/ChangeLog	(revision 47945)
@@ -1,3 +1,7 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/ChangeLog#L1
+Wed Oct 15 23:08:02 2014  Rei Odaira  <Rei.Odaira@g...>
+
+	* configure.in: Fix typo. [Bug #9914]
+
 Wed Oct 15 22:46:52 2014  NAKAMURA Usaku  <usa@r...>
 
 	* error.c: update exception tree. [DOC]
Index: ruby_2_1/version.h
===================================================================
--- ruby_2_1/version.h	(revision 47944)
+++ ruby_2_1/version.h	(revision 47945)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/version.h#L1
 #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

Property changes on: ruby_2_1
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r47819


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