usa	2016-04-22 15:24:15 +0900 (Fri, 22 Apr 2016)

  New Revision: 54684

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

  Log:
    merge revision(s) 54529: [Backport #12264]
    
    * ext/win32/lib/win32/registry.rb (DeleteValue, DeleteKey): fix
      API names.  [ruby-core:74863] [Bug #12264]

  Modified directories:
    branches/ruby_2_2/
  Modified files:
    branches/ruby_2_2/ChangeLog
    branches/ruby_2_2/ext/win32/lib/win32/registry.rb
    branches/ruby_2_2/version.h
Index: ruby_2_2/ChangeLog
===================================================================
--- ruby_2_2/ChangeLog	(revision 54683)
+++ ruby_2_2/ChangeLog	(revision 54684)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ChangeLog#L1
+Fri Apr 22 15:19:01 2016  Joe Swatosh  <joe.swatosh@g...>
+
+	* ext/win32/lib/win32/registry.rb (DeleteValue, DeleteKey): fix
+	  API names.  [ruby-core:74863] [Bug #12264]
+
 Fri Apr 22 15:13:39 2016  Nobuyoshi Nakada  <nobu@r...>
 
 	* vm_core.h (rb_vm_struct): make at_exit a single linked list but
Index: ruby_2_2/version.h
===================================================================
--- ruby_2_2/version.h	(revision 54683)
+++ ruby_2_2/version.h	(revision 54684)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/version.h#L1
 #define RUBY_VERSION "2.2.5"
 #define RUBY_RELEASE_DATE "2016-04-22"
-#define RUBY_PATCHLEVEL 301
+#define RUBY_PATCHLEVEL 302
 
 #define RUBY_RELEASE_YEAR 2016
 #define RUBY_RELEASE_MONTH 4
Index: ruby_2_2/ext/win32/lib/win32/registry.rb
===================================================================
--- ruby_2_2/ext/win32/lib/win32/registry.rb	(revision 54683)
+++ ruby_2_2/ext/win32/lib/win32/registry.rb	(revision 54684)
@@ -332,11 +332,11 @@ For detail, see the MSDN[http://msdn.mic https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ext/win32/lib/win32/registry.rb#L332
       end
 
       def DeleteValue(hkey, name)
-        check RegDeleteValue.call(hkey, make_wstr(name))
+        check RegDeleteValueW.call(hkey, make_wstr(name))
       end
 
       def DeleteKey(hkey, name)
-        check RegDeleteKey.call(hkey, make_wstr(name))
+        check RegDeleteKeyW.call(hkey, make_wstr(name))
       end
 
       def FlushKey(hkey)

Property changes on: ruby_2_2
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r54529


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