ruby-changes:21827
From: nobu <ko1@a...>
Date: Mon, 28 Nov 2011 10:36:23 +0900 (JST)
Subject: [ruby-changes:21827] nobu:r33876 (trunk): * include/ruby/subst.h: moved Windows specific substitions from
nobu 2011-11-28 10:36:09 +0900 (Mon, 28 Nov 2011) New Revision: 33876 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=33876 Log: * include/ruby/subst.h: moved Windows specific substitions from win32.h. * ext/socket/rubysocket.h: include ruby/subst.h. [Bug #5675] Modified files: trunk/ChangeLog trunk/ext/socket/rubysocket.h trunk/include/ruby/subst.h trunk/include/ruby/win32.h Index: include/ruby/subst.h =================================================================== --- include/ruby/subst.h (revision 33875) +++ include/ruby/subst.h (revision 33876) @@ -17,4 +17,96 @@ #define close ruby_close #endif +#ifdef __WIN32__ +#undef inet_ntop +#define inet_ntop(f,a,n,l) rb_w32_inet_ntop(f,a,n,l) + +#undef accept +#define accept(s, a, l) rb_w32_accept(s, a, l) + +#undef bind +#define bind(s, a, l) rb_w32_bind(s, a, l) + +#undef connect +#define connect(s, a, l) rb_w32_connect(s, a, l) + +#undef select +#define select(n, r, w, e, t) rb_w32_select(n, r, w, e, t) + +#undef getpeername +#define getpeername(s, a, l) rb_w32_getpeername(s, a, l) + +#undef getsockname +#define getsockname(s, a, l) rb_w32_getsockname(s, a, l) + +#undef getsockopt +#define getsockopt(s, v, n, o, l) rb_w32_getsockopt(s, v, n, o, l) + +#undef ioctlsocket +#define ioctlsocket(s, c, a) rb_w32_ioctlsocket(s, c, a) + +#undef listen +#define listen(s, b) rb_w32_listen(s, b) + +#undef recv +#define recv(s, b, l, f) rb_w32_recv(s, b, l, f) + +#undef recvfrom +#define recvfrom(s, b, l, f, fr, frl) rb_w32_recvfrom(s, b, l, f, fr, frl) + +#undef send +#define send(s, b, l, f) rb_w32_send(s, b, l, f) + +#undef sendto +#define sendto(s, b, l, f, t, tl) rb_w32_sendto(s, b, l, f, t, tl) + +#undef setsockopt +#define setsockopt(s, v, n, o, l) rb_w32_setsockopt(s, v, n, o, l) + +#undef shutdown +#define shutdown(s, h) rb_w32_shutdown(s, h) + +#undef socket +#define socket(s, t, p) rb_w32_socket(s, t, p) + +#undef gethostbyaddr +#define gethostbyaddr(a, l, t) rb_w32_gethostbyaddr(a, l, t) + +#undef gethostbyname +#define gethostbyname(n) rb_w32_gethostbyname(n) + +#undef gethostname +#define gethostname(n, l) rb_w32_gethostname(n, l) + +#undef getprotobyname +#define getprotobyname(n) rb_w32_getprotobyname(n) + +#undef getprotobynumber +#define getprotobynumber(n) rb_w32_getprotobynumber(n) + +#undef getservbyname +#define getservbyname(n, p) rb_w32_getservbyname(n, p) + +#undef getservbyport +#define getservbyport(p, pr) rb_w32_getservbyport(p, pr) + +#undef socketpair +#define socketpair(a, t, p, s) rb_w32_socketpair(a, t, p, s) + +#undef get_osfhandle +#define get_osfhandle(h) rb_w32_get_osfhandle(h) + +#undef getcwd +#define getcwd(b, s) rb_w32_getcwd(b, s) + +#undef getenv +#define getenv(n) rb_w32_getenv(n) + +#undef rename +#define rename(o, n) rb_w32_rename(o, n) + +#undef times +#define times(t) rb_w32_times(t) #endif + +#endif Index: include/ruby/win32.h =================================================================== --- include/ruby/win32.h (revision 33875) +++ include/ruby/win32.h (revision 33876) @@ -586,98 +586,6 @@ #undef FD_ISSET #define FD_ISSET(f, s) rb_w32_fdisset(f, s) -#ifdef RUBY_EXPORT -#undef inet_ntop -#define inet_ntop(f,a,n,l) rb_w32_inet_ntop(f,a,n,l) - -#undef accept -#define accept(s, a, l) rb_w32_accept(s, a, l) - -#undef bind -#define bind(s, a, l) rb_w32_bind(s, a, l) - -#undef connect -#define connect(s, a, l) rb_w32_connect(s, a, l) - -#undef select -#define select(n, r, w, e, t) rb_w32_select(n, r, w, e, t) - -#undef getpeername -#define getpeername(s, a, l) rb_w32_getpeername(s, a, l) - -#undef getsockname -#define getsockname(s, a, l) rb_w32_getsockname(s, a, l) - -#undef getsockopt -#define getsockopt(s, v, n, o, l) rb_w32_getsockopt(s, v, n, o, l) - -#undef ioctlsocket -#define ioctlsocket(s, c, a) rb_w32_ioctlsocket(s, c, a) - -#undef listen -#define listen(s, b) rb_w32_listen(s, b) - -#undef recv -#define recv(s, b, l, f) rb_w32_recv(s, b, l, f) - -#undef recvfrom -#define recvfrom(s, b, l, f, fr, frl) rb_w32_recvfrom(s, b, l, f, fr, frl) - -#undef send -#define send(s, b, l, f) rb_w32_send(s, b, l, f) - -#undef sendto -#define sendto(s, b, l, f, t, tl) rb_w32_sendto(s, b, l, f, t, tl) - -#undef setsockopt -#define setsockopt(s, v, n, o, l) rb_w32_setsockopt(s, v, n, o, l) - -#undef shutdown -#define shutdown(s, h) rb_w32_shutdown(s, h) - -#undef socket -#define socket(s, t, p) rb_w32_socket(s, t, p) - -#undef gethostbyaddr -#define gethostbyaddr(a, l, t) rb_w32_gethostbyaddr(a, l, t) - -#undef gethostbyname -#define gethostbyname(n) rb_w32_gethostbyname(n) - -#undef gethostname -#define gethostname(n, l) rb_w32_gethostname(n, l) - -#undef getprotobyname -#define getprotobyname(n) rb_w32_getprotobyname(n) - -#undef getprotobynumber -#define getprotobynumber(n) rb_w32_getprotobynumber(n) - -#undef getservbyname -#define getservbyname(n, p) rb_w32_getservbyname(n, p) - -#undef getservbyport -#define getservbyport(p, pr) rb_w32_getservbyport(p, pr) - -#undef socketpair -#define socketpair(a, t, p, s) rb_w32_socketpair(a, t, p, s) - -#undef get_osfhandle -#define get_osfhandle(h) rb_w32_get_osfhandle(h) - -#undef getcwd -#define getcwd(b, s) rb_w32_getcwd(b, s) - -#undef getenv -#define getenv(n) rb_w32_getenv(n) - -#undef rename -#define rename(o, n) rb_w32_rename(o, n) - -#undef times -#define times(t) rb_w32_times(t) -#endif - struct tms { long tms_utime; long tms_stime; Index: ChangeLog =================================================================== --- ChangeLog (revision 33875) +++ ChangeLog (revision 33876) @@ -1,3 +1,10 @@ +Mon Nov 28 10:36:00 2011 Nobuyoshi Nakada <nobu@r...> + + * include/ruby/subst.h: moved Windows specific substitions from + win32.h. + + * ext/socket/rubysocket.h: include ruby/subst.h. [Bug #5675] + Mon Nov 28 10:20:58 2011 NAKAMURA Usaku <usa@r...> * win32/{Makeilfe.sub,win32.c} (FILE_COUNT, FILE_READPTR): move the @@ -2,3 +9,3 @@ definitions from config.h to win32.c. I dared to have left such - macros, for other future compiler support. + macros, for other future compiler support. [ruby-core:41313] [Bug #5674] Index: ext/socket/rubysocket.h =================================================================== --- ext/socket/rubysocket.h (revision 33875) +++ ext/socket/rubysocket.h (revision 33876) @@ -4,6 +4,7 @@ #include "ruby/ruby.h" #include "ruby/io.h" #include "ruby/util.h" +#include "ruby/subst.h" #include "internal.h" #include <stdio.h> #include <sys/types.h> -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/