1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

win32/win32.c: add rb_w32_inet_pton

Browse Source 
* include/ruby/win32.h, win32/win32.c (rb_w32_inet_pton): add a
  wrapper function for inet_pton minimum supported client is
  Vista, as well as inet_ntop.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@45150 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2014-02-23 02:54:04 +00:00
parent 0728a4ed70
commit 1b81dafdd5
3 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
Sun Feb 23 11:54:02 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
* include/ruby/win32.h, win32/win32.c (rb_w32_inet_pton): add a
wrapper function for inet_pton minimum supported client is
Vista, as well as inet_ntop.
Sun Feb 23 11:33:25 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> Sun Feb 23 11:33:25 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com>
* test/net/imap/test_imap.rb: remove unused variables. * test/net/imap/test_imap.rb: remove unused variables.

4
include/ruby/win32.h
View File

@ -309,6 +309,7 @@ extern char **rb_w32_get_environ(void);
extern void rb_w32_free_environ(char **); extern void rb_w32_free_environ(char **);
extern int rb_w32_map_errno(DWORD); extern int rb_w32_map_errno(DWORD);
extern const char *WSAAPI rb_w32_inet_ntop(int,const void *,char *,size_t); extern const char *WSAAPI rb_w32_inet_ntop(int,const void *,char *,size_t);
extern int WSAAPI rb_w32_inet_pton(int,const char *,void *);
extern DWORD rb_w32_osver(void); extern DWORD rb_w32_osver(void);
extern int chown(const char *, int, int); extern int chown(const char *, int, int);
@ -657,6 +658,9 @@ extern char *rb_w32_strerror(int);
#undef inet_ntop #undef inet_ntop
#define inet_ntop(f,a,n,l) rb_w32_inet_ntop(f,a,n,l) #define inet_ntop(f,a,n,l) rb_w32_inet_ntop(f,a,n,l)
#undef inet_pton
#define inet_pton(f,s,d) rb_w32_inet_pton(f,s,d)
#undef accept #undef accept
#define accept(s, a, l) rb_w32_accept(s, a, l) #define accept(s, a, l) rb_w32_accept(s, a, l)

13
win32/win32.c
View File

@ -6958,6 +6958,19 @@ rb_w32_inet_ntop(int af, const void *addr, char *numaddr, size_t numaddr_len)
return numaddr; return numaddr;
} }
/* License: Ruby's */
int WSAAPI
rb_w32_inet_pton(int af, const char *src, void *dst)
{
typedef int (WSAAPI inet_pton_t)(int, const char*, void *);
inet_pton_t *pInetPton;
pInetPton = (inet_pton_t *)get_proc_address("ws2_32", "inet_pton", NULL);
if (pInetPton) {
return pInetPton(af, src, dst);
}
return 0;
}
/* License: Ruby's */ /* License: Ruby's */
char char
rb_w32_fd_is_text(int fd) rb_w32_fd_is_text(int fd)