usa	2012-12-19 21:20:36 +0900 (Wed, 19 Dec 2012)

  New Revision: 38471

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

  Log:
    merge revision(s) 34871: [Backport #7415]
    
    * file.c (file_expand_path): use wcscasecmp().

  Modified directories:
    branches/ruby_1_9_3/
  Modified files:
    branches/ruby_1_9_3/ChangeLog
    branches/ruby_1_9_3/file.c
    branches/ruby_1_9_3/version.h

Index: ruby_1_9_3/ChangeLog
===================================================================
--- ruby_1_9_3/ChangeLog	(revision 38470)
+++ ruby_1_9_3/ChangeLog	(revision 38471)
@@ -1,3 +1,7 @@ https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/ChangeLog#L1
+Wed Dec 19 21:20:23 2012  Nobuyoshi Nakada  <nobu@r...>
+
+	* file.c (file_expand_path): use wcscasecmp().
+
 Wed Dec 19 21:15:29 2012  Nobuyoshi Nakada  <nobu@r...>
 
 	* parse.y (parser_yylex): fix false usage of local variable, it cannot
Index: ruby_1_9_3/version.h
===================================================================
--- ruby_1_9_3/version.h	(revision 38470)
+++ ruby_1_9_3/version.h	(revision 38471)
@@ -1,5 +1,5 @@ https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/version.h#L1
 #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
Index: ruby_1_9_3/file.c
===================================================================
--- ruby_1_9_3/file.c	(revision 38470)
+++ ruby_1_9_3/file.c	(revision 38471)
@@ -17,6 +17,7 @@ https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/file.c#L17
 #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 https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/file.c#L3191
 	    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

Property changes on: ruby_1_9_3
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r34871


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