summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-08-10 06:35:05 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-08-10 06:35:05 +0000
commit833ad92d1852efb40f6f7fafa5bc5e784e0e49ea (patch)
treef916830c952960ce4e749b49f1855c49ba22aa0c
parent41fe7e4eb901dc31887e8a684141a33b77c26702 (diff)
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. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@55849 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog8
-rw-r--r--ext/win32/lib/win32/resolv.rb1
-rw-r--r--ext/win32/resolv/extconf.rb4
3 files changed, 12 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index e430f3a..da2c8fb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Wed Aug 10 15:35:03 2016 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * 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@mrkn.jp>
* hash.c (rb_hash_map_v, rb_hash_map_v_bang): impelement Hash#map_v and
diff --git a/ext/win32/lib/win32/resolv.rb b/ext/win32/lib/win32/resolv.rb
index 6990941..647f144 100644
--- a/ext/win32/lib/win32/resolv.rb
+++ b/ext/win32/lib/win32/resolv.rb
@@ -9,6 +9,7 @@ require 'win32/registry'
module Win32
module Resolv
API = Registry::API
+ Error = Registry::Error
def self.get_hosts_path
path = get_hosts_dir
diff --git a/ext/win32/resolv/extconf.rb b/ext/win32/resolv/extconf.rb
index 2ae4bb2..01f3df7 100644
--- a/ext/win32/resolv/extconf.rb
+++ b/ext/win32/resolv/extconf.rb
@@ -1 +1,3 @@
-create_makefile('win32/resolv')
+if have_library('iphlpapi', 'GetNetworkParams')
+ create_makefile('win32/resolv')
+end