From 44895d6ea25a9450c6558be4778a095e055e4821 Mon Sep 17 00:00:00 2001 From: usa Date: Tue, 17 Nov 2009 06:47:58 +0000 Subject: [PATCH] * dir.c (READDIR): this branch doesn't have rb_w32_readdir_with_enc(). git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@25813 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++++ dir.c | 2 -- version.h | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index afda849b88..e3e8d10fb0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Tue Nov 17 15:46:23 2009 NAKAMURA Usaku + + * dir.c (READDIR): this branch doesn't have rb_w32_readdir_with_enc(). + Fri Sep 18 07:06:41 2009 Kazuhiro NISHIYAMA * test/fileutils/test_fileutils.rb: add a test for [ruby-dev:39345] diff --git a/dir.c b/dir.c index 84a3816b8a..16761b5647 100644 --- a/dir.c +++ b/dir.c @@ -480,8 +480,6 @@ dir_path(VALUE dir) #if defined HAVE_READDIR_R # define READDIR(dir, enc, entry, dp) (readdir_r(dir, entry, &(dp)) == 0 && dp != 0) -#elif defined _WIN32 -# define READDIR(dir, enc, entry, dp) ((dp = rb_w32_readdir_with_enc(dir, enc)) != 0) #else # define READDIR(dir, enc, entry, dp) ((dp = readdir(dir)) != 0) #endif diff --git a/version.h b/version.h index 86f32771db..4196315443 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.1" -#define RUBY_PATCHLEVEL 336 +#define RUBY_PATCHLEVEL 337 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 9 #define RUBY_VERSION_TEENY 1