ruby-changes:9705
From: akr <ko1@a...>
Date: Thu, 1 Jan 2009 20:18:38 +0900 (JST)
Subject: [ruby-changes:9705] Ruby:r21246 (trunk): * ext/socket/socket.c: include constants.h at top.
akr 2009-01-01 20:18:18 +0900 (Thu, 01 Jan 2009) New Revision: 21246 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=21246 Log: * ext/socket/socket.c: include constants.h at top. Modified files: trunk/ChangeLog trunk/ext/socket/socket.c Index: ChangeLog =================================================================== --- ChangeLog (revision 21245) +++ ChangeLog (revision 21246) @@ -1,3 +1,7 @@ +Thu Jan 1 20:17:47 2009 Tanaka Akira <akr@f...> + + * ext/socket/socket.c: include constants.h at top. + Thu Jan 1 19:53:33 2009 Tanaka Akira <akr@f...> * ext/socket/mkconstants.rb: add valp argument for family_to_int and Index: ext/socket/socket.c =================================================================== --- ext/socket/socket.c (revision 21245) +++ ext/socket/socket.c (revision 21246) @@ -130,6 +130,14 @@ }; #endif +static void sock_define_const(const char *name, int value, VALUE mConst); +static void sock_define_uconst(const char *name, unsigned int value, VALUE mConst); +#define sock_define_const(name, value) sock_define_const(name, value, mConst) +#define sock_define_uconst(name, value) sock_define_uconst(name, value, mConst) +#include "constants.h" +#undef sock_define_const +#undef sock_define_uconst + #if defined(INET6) && (defined(LOOKUP_ORDER_HACK_INET) || defined(LOOKUP_ORDER_HACK_INET6)) #define LOOKUP_ORDERS (sizeof(lookup_order_table) / sizeof(lookup_order_table[0])) static const int lookup_order_table[] = { @@ -981,8 +989,6 @@ return sock_getaddrinfo(host, port, &hints); } -static char *family_to_str(int val); - static VALUE ipaddr(struct sockaddr *sockaddr, int norevlookup) { @@ -2264,9 +2270,6 @@ } #endif -static int family_to_int(char *str, int len, int *valp); -static int socktype_to_int(char *str, int len, int *valp); - static void setup_domain_and_type(VALUE domain, int *dv, VALUE type, int *tv) { @@ -3516,11 +3519,6 @@ rb_define_const(mConst, name, UINT2NUM(value)); } -#define sock_define_const(name, value) sock_define_const(name, value, mConst) -#define sock_define_uconst(name, value) sock_define_uconst(name, value, mConst) - -#include "constants.h" - /* * Class +Socket+ provides access to the underlying operating system * socket implementations. It can be used to provide more operating system -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/