diff options
author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-12-19 12:20:36 +0000 |
---|---|---|
committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-12-19 12:20:36 +0000 |
commit | 94d2a3513971d4ceb3b52346169afcb3cc7ad5b9 (patch) | |
tree | 5621e4f48e4afb84fa316afc80cefd7f095b45a9 | |
parent | f19478d5e39e9512bdbc73cd6510bd341d058128 (diff) |
merge revision(s) 34871: [Backport #7415]
* file.c (file_expand_path): use wcscasecmp().
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@38471 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | file.c | 3 | ||||
-rw-r--r-- | version.h | 2 |
3 files changed, 7 insertions, 2 deletions
@@ -1,3 +1,7 @@ +Wed Dec 19 21:20:23 2012 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * file.c (file_expand_path): use wcscasecmp(). + Wed Dec 19 21:15:29 2012 Nobuyoshi Nakada <nobu@ruby-lang.org> * parse.y (parser_yylex): fix false usage of local variable, it cannot @@ -17,6 +17,7 @@ #ifdef __CYGWIN__ #include <windows.h> #include <sys/cygwin.h> +#include <wchar.h> #endif #include "ruby/ruby.h" @@ -3190,7 +3191,7 @@ rb_file_expand_path_internal(VALUE fname, VALUE dname, int abs_mode, int long_na len = lstrlenW(wfd.cFileName); #ifdef __CYGWIN__ if (lnk_added && len > 4 && - wcsicmp(wfd.cFileName + len - 4, L".lnk") == 0) { + wcscasecmp(wfd.cFileName + len - 4, L".lnk") == 0) { wfd.cFileName[len -= 4] = L'\0'; } #else @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.3" -#define RUBY_PATCHLEVEL 344 +#define RUBY_PATCHLEVEL 345 #define RUBY_RELEASE_DATE "2012-12-19" #define RUBY_RELEASE_YEAR 2012 |