[前][次][番号順一覧][スレッド一覧]

ruby-changes:43777

From: nobu <ko1@a...>
Date: Wed, 10 Aug 2016 15:35:11 +0900 (JST)
Subject: [ruby-changes:43777] nobu:r55849 (trunk): win32/resolv: fix for cygwin

nobu	2016-08-10 15:35:05 +0900 (Wed, 10 Aug 2016)

  New Revision: 55849

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

  Log:
    win32/resolv: fix for cygwin
    
    * ext/win32/resolv/resolv.c: needs windows.h for iphlpapi.h on
      cygwin.  [ruby-core:76791] [Bug #12663]
    * ext/win32/resolv/resolv.c (w32error_make_error): use
      Win32::Resolv::Error, an alias of Win32::Registry::Error.

  Modified files:
    trunk/ChangeLog
    trunk/ext/win32/lib/win32/resolv.rb
    trunk/ext/win32/resolv/extconf.rb
Index: ext/win32/resolv/extconf.rb
===================================================================
--- ext/win32/resolv/extconf.rb	(revision 55848)
+++ ext/win32/resolv/extconf.rb	(revision 55849)
@@ -1 +1,3 @@
-create_makefile('win32/resolv')
+if have_library('iphlpapi', 'GetNetworkParams')
+  create_makefile('win32/resolv')
+end
Index: ext/win32/lib/win32/resolv.rb
===================================================================
--- ext/win32/lib/win32/resolv.rb	(revision 55848)
+++ ext/win32/lib/win32/resolv.rb	(revision 55849)
@@ -9,6 +9,7 @@ require 'win32/registry' https://github.com/ruby/ruby/blob/trunk/ext/win32/lib/win32/resolv.rb#L9
 module Win32
   module Resolv
     API = Registry::API
+    Error = Registry::Error
 
     def self.get_hosts_path
       path = get_hosts_dir
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 55848)
+++ ChangeLog	(revision 55849)
@@ -1,3 +1,11 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Wed Aug 10 15:35:03 2016  Nobuyoshi Nakada  <nobu@r...>
+
+	* ext/win32/resolv/resolv.c: needs windows.h for iphlpapi.h on
+	  cygwin.  [ruby-core:76791] [Bug #12663]
+
+	* ext/win32/resolv/resolv.c (w32error_make_error): use
+	  Win32::Resolv::Error, an alias of Win32::Registry::Error.
+
 Tue Aug  9 17:50:00 2016  Kenta Murata  <mrkn@m...>
 
 	* hash.c (rb_hash_map_v, rb_hash_map_v_bang): impelement Hash#map_v and

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

[前][次][番号順一覧][スレッド一覧]