kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

win32/resolv: fix for cygwin

Browse source 
* 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@55852 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2016-08-10 11:11:36 +00:00
parent 064ed74be4
commit 27863a0ccd
1 changed files with 5 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
ext/win32/resolv/resolv.c
View file

@ -1,20 +1,16 @@
#include <ruby.h>
#include <ruby/encoding.h>
#include <windows.h>
#ifndef NTDDI_VERSION
#define NTDDI_VERSION 0x06000000
#endif
#include <iphlpapi.h>
static VALUE
w32error_init(VALUE self, VALUE code)
{
VALUE str = rb_str_new_cstr(rb_w32_strerror(NUM2INT(code)));
rb_ivar_set(self, rb_intern("@code"), code);
return rb_call_super(1, &str);
}
static VALUE
w32error_make_error(DWORD e)
{
VALUE code = ULONG2NUM(e);
return rb_class_new_instance(1, &code, rb_path2class("Win32::Error"));
return rb_class_new_instance(1, &code, rb_path2class("Win32::Resolv::Error"));
}
static void
@ -59,8 +55,6 @@ InitVM_resolv(void)
VALUE mWin32 = rb_define_module("Win32");
VALUE resolv = rb_define_module_under(mWin32, "Resolv");
VALUE singl = rb_singleton_class(resolv);
VALUE eclass = rb_define_class_under(mWin32, "Error", rb_eStandardError);
rb_define_method(eclass, "initialize", w32error_init, 1);
rb_define_private_method(singl, "get_dns_server_list", get_dns_server_list, 0);
}