* ext/socket/mkconstants.rb: generate a header file for generated

  functions.

* ext/socket/rubysocket.h: include constdefs.h.  don't declare
  generated functions.

* ext/socket/constants.c: include constdefs.c instead of constants.h.

* ext/socket/depend: dependency updated.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@21627 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 1 insertions, 7 deletions

diff --git a/ext/socket/rubysocket.h b/ext/socket/rubysocket.h
index 9f6116016b..486409c5f3 100644
--- a/ext/socket/rubysocket.h
+++ b/ext/socket/rubysocket.h
@@ -142,6 +142,7 @@ int Rconnect();
 #endif
 #endif
 
+#include "constdefs.h"
 
 #define BLOCKING_REGION(func, arg) (long)rb_thread_blocking_region((func), (arg), RUBY_UBF_IO, 0)
 
@@ -152,19 +153,12 @@ char *sockaddr_string_value_ptr(volatile VALUE *);
 
 NORETURN(void raise_socket_error(const char *, int));
 
-int family_to_int(char *str, int len, int *valp);
-
 int family_arg(VALUE domain);
 int socktype_arg(VALUE type);
 int level_arg(VALUE level);
 int optname_arg(int level, VALUE optname);
 int shutdown_how_arg(VALUE how);
 
-ID intern_protocol_family(int val);
-ID intern_socktype(int val);
-ID intern_ipproto(int val);
-ID intern_family(int val);
-
 int rb_getaddrinfo(const char *node, const char *service, const struct addrinfo *hints, struct addrinfo **res);
 int rb_getnameinfo(const struct sockaddr *sa, socklen_t salen, char *host, size_t hostlen, char *serv, size_t servlen, int flags);
 struct addrinfo *sock_addrinfo(VALUE host, VALUE port, int socktype, int flags);