usa	2015-08-17 16:15:28 +0900 (Mon, 17 Aug 2015)

  New Revision: 51596

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

  Log:
    merge revision(s) 49542: [Backport #10820]
    
    * ext/win32/lib/win32/registry.rb (Win32::Registry::API): use wide
      versions of RegDeleteValue and RegDeleteKey.
      [ruby-core:67958] [Bug #10820]

  Modified directories:
    branches/ruby_2_1/
  Modified files:
    branches/ruby_2_1/ChangeLog
    branches/ruby_2_1/ext/win32/lib/win32/registry.rb
    branches/ruby_2_1/version.h
Index: ruby_2_1/ChangeLog
===================================================================
--- ruby_2_1/ChangeLog	(revision 51595)
+++ ruby_2_1/ChangeLog	(revision 51596)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/ChangeLog#L1
+Mon Aug 17 16:14:38 2015  Nobuyoshi Nakada  <nobu@r...>
+
+	* ext/win32/lib/win32/registry.rb (Win32::Registry::API): use wide
+	  versions of RegDeleteValue and RegDeleteKey.
+	  [ruby-core:67958] [Bug #10820]
+
 Tue Jul  7 13:39:46 2015  SHIBATA Hiroshi  <hsbt@r...>
 
 	* ext/zlib/zlib.c: Fix indentation for rdoc.
Index: ruby_2_1/ext/win32/lib/win32/registry.rb
===================================================================
--- ruby_2_1/ext/win32/lib/win32/registry.rb	(revision 51595)
+++ ruby_2_1/ext/win32/lib/win32/registry.rb	(revision 51596)
@@ -222,8 +222,8 @@ For detail, see the MSDN[http://msdn.mic https://github.com/ruby/ruby/blob/trunk/ruby_2_1/ext/win32/lib/win32/registry.rb#L222
         "long RegEnumKeyExW(void *, long, void *, void *, void *, void *, void *, void *)",
         "long RegQueryValueExW(void *, void *, void *, void *, void *, void *)",
         "long RegSetValueExW(void *, void *, long, long, void *, long)",
-        "long RegDeleteValue(void *, void *)",
-        "long RegDeleteKey(void *, void *)",
+        "long RegDeleteValueW(void *, void *)",
+        "long RegDeleteKeyW(void *, void *)",
         "long RegFlushKey(void *)",
         "long RegCloseKey(void *)",
         "long RegQueryInfoKey(void *, void *, void *, void *, void *, void *, void *, void *, void *, void *, void *, void *)",
Index: ruby_2_1/version.h
===================================================================
--- ruby_2_1/version.h	(revision 51595)
+++ ruby_2_1/version.h	(revision 51596)
@@ -1,10 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/version.h#L1
 #define RUBY_VERSION "2.1.7"
-#define RUBY_RELEASE_DATE "2015-07-07"
-#define RUBY_PATCHLEVEL 379
+#define RUBY_RELEASE_DATE "2015-08-17"
+#define RUBY_PATCHLEVEL 380
 
 #define RUBY_RELEASE_YEAR 2015
-#define RUBY_RELEASE_MONTH 7
-#define RUBY_RELEASE_DAY 7
+#define RUBY_RELEASE_MONTH 8
+#define RUBY_RELEASE_DAY 17
 
 #include "ruby/version.h"
 

Property changes on: ruby_2_1
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r49542


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