diff options
| author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-02-21 14:08:26 +0000 |
|---|---|---|
| committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-02-21 14:08:26 +0000 |
| commit | 7463add18fb4fa618bda79659b0da87a430fc0b2 (patch) | |
| tree | 0024f4290ea108be628cd07543d020a665ab3440 | |
| parent | 1d5d057531189c43ed603a7d9105bdfca71e3319 (diff) | |
merge revision(s) 44472: [Backport #9333]
* win32/Makefile.sub: remove HAVE_FSEEKO because fseeko removed from win32/win32.c
Fixed [Bug #9333].
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@45080 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | version.h | 2 | ||||
| -rw-r--r-- | win32/Makefile.sub | 1 |
3 files changed, 6 insertions, 2 deletions
@@ -1,3 +1,8 @@ +Fri Feb 21 23:07:56 2014 Akio Tajima <artonx@yahoo.co.jp> + + * 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@tenderlovemaking.com> * ext/psych/lib/psych/visitors/yaml_tree.rb: dumping strings with @@ -1,6 +1,6 @@ #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 diff --git a/win32/Makefile.sub b/win32/Makefile.sub index a04e8024be..d6289bc53d 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -677,7 +677,6 @@ $(CONFIG_H): $(MKFILES) $(srcdir)/win32/Makefile.sub $(win_srcdir)/Makefile.sub #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 |