naruse	2014-02-21 23:08:26 +0900 (Fri, 21 Feb 2014)

  New Revision: 45080

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

  Log:
    merge revision(s) 44472: [Backport #9333]
    
    * win32/Makefile.sub: remove HAVE_FSEEKO because fseeko removed from win32/win32.c
      Fixed [Bug #9333].

  Modified directories:
    branches/ruby_2_1/
  Modified files:
    branches/ruby_2_1/ChangeLog
    branches/ruby_2_1/version.h
    branches/ruby_2_1/win32/Makefile.sub
Index: ruby_2_1/ChangeLog
===================================================================
--- ruby_2_1/ChangeLog	(revision 45079)
+++ ruby_2_1/ChangeLog	(revision 45080)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/ChangeLog#L1
+Fri Feb 21 23:07:56 2014  Akio Tajima <artonx@y...>
+
+	* win32/Makefile.sub: remove HAVE_FSEEKO because fseeko removed from win32/win32.c
+	  Fixed [Bug #9333].
+
 Fri Feb 21 23:00:34 2014  Aaron Patterson <aaron@t...>
 
 	* ext/psych/lib/psych/visitors/yaml_tree.rb: dumping strings with
Index: ruby_2_1/win32/Makefile.sub
===================================================================
--- ruby_2_1/win32/Makefile.sub	(revision 45079)
+++ ruby_2_1/win32/Makefile.sub	(revision 45080)
@@ -677,7 +677,6 @@ $(CONFIG_H): $(MKFILES) $(srcdir)/win32/ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/win32/Makefile.sub#L677
 #define HAVE_GETCWD 1
 #define HAVE_TRUNCATE 1
 #define HAVE_FTRUNCATE 1
-#define HAVE_FSEEKO 1
 #define HAVE_TIMES 1
 #define HAVE_FCNTL 1
 #define HAVE_LINK 1
Index: ruby_2_1/version.h
===================================================================
--- ruby_2_1/version.h	(revision 45079)
+++ ruby_2_1/version.h	(revision 45080)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/version.h#L1
 #define RUBY_VERSION "2.1.1"
 #define RUBY_RELEASE_DATE "2014-02-21"
-#define RUBY_PATCHLEVEL 44
+#define RUBY_PATCHLEVEL 45
 
 #define RUBY_RELEASE_YEAR 2014
 #define RUBY_RELEASE_MONTH 2

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


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