Permalink
Browse files

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
  • Loading branch information...
1 parent f19478d commit 94d2a3513971d4ceb3b52346169afcb3cc7ad5b9 @unak unak committed Dec 19, 2012
Showing with 7 additions and 2 deletions.
  1. +4 −0 ChangeLog
  2. +2 −1 file.c
  3. +1 −1 version.h
View
@@ -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
View
3 file.c
@@ -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
View
@@ -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

0 comments on commit 94d2a35

Please sign in to comment.