[svn] Stop using AI_ADDRCONFIG.

[wget] / src / connect.h

diff --git a/src/connect.h b/src/connect.h
index 9d67d070df139e7f45b7f13e6dd92380f4e285ff..4dbebad7ba65bb365a1bf186a1ea02ac8c180a8f 100644 (file)
--- a/src/connect.h
+++ b/src/connect.h
@@ -32,12 +32,6 @@ so, delete this exception statement from your version.  */
 
 #include "host.h"              /* for definition of ip_address */
 
-#ifndef ENABLE_IPV6
-# ifndef HAVE_SOCKADDR_STORAGE
-#  define sockaddr_storage sockaddr_in
-# endif
-#endif /* ENABLE_IPV6 */
-
 /* Function declarations */
 
 /* Returned by connect_to_host when host name cannot be resolved.  */
@@ -56,6 +50,8 @@ enum {
 };
 int socket_ip_address PARAMS ((int, ip_address *, int));
 
+int retryable_socket_connect_error PARAMS ((int));
+
 /* Flags for select_fd's WAIT_FOR argument. */
 enum {
   WAIT_FOR_READ = 1,
@@ -64,15 +60,18 @@ enum {
 int select_fd PARAMS ((int, double, int));
 int test_socket_open PARAMS ((int));
 
-typedef int (*xreader_t) PARAMS ((int, char *, int, void *));
-typedef int (*xwriter_t) PARAMS ((int, char *, int, void *));
-typedef int (*xpoller_t) PARAMS ((int, double, int, void *));
-typedef void (*xcloser_t) PARAMS ((int, void *));
-void register_extended PARAMS ((int,
-                               xreader_t, xwriter_t, xpoller_t, xcloser_t,
-                               void *));
+typedef int (*fd_reader_t) PARAMS ((int, char *, int, void *));
+typedef int (*fd_writer_t) PARAMS ((int, char *, int, void *));
+typedef int (*fd_poller_t) PARAMS ((int, double, int, void *));
+typedef int (*fd_peeker_t) PARAMS ((int, char *, int, void *));
+typedef void (*fd_closer_t) PARAMS ((int, void *));
+void fd_register_transport PARAMS ((int, fd_reader_t, fd_writer_t,
+                                   fd_poller_t, fd_peeker_t, fd_closer_t,
+                                   void *));
+void *fd_transport_context PARAMS ((int));
 
-int xread PARAMS ((int, char *, int, double));
-int xwrite PARAMS ((int, char *, int, double));
-void xclose PARAMS ((int));
+int fd_read PARAMS ((int, char *, int, double));
+int fd_write PARAMS ((int, char *, int, double));
+int fd_peek PARAMS ((int, char *, int, double));
+void fd_close PARAMS ((int));
 #endif /* CONNECT_H */