[svn] Look for and use socklen_t.

[wget] / src / host.h

diff --git a/src/host.h b/src/host.h
index 058b19989635ede835e76ce689178efb572f834c..3b863aab66e18d0d997170128e240d5b6f19b764 100644 (file)
--- a/src/host.h
+++ b/src/host.h
@@ -15,7 +15,17 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with Wget; if not, write to the Free Software
-Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+In addition, as a special exception, the Free Software Foundation
+gives permission to link the code of its release of Wget with the
+OpenSSL project's "OpenSSL" library (or with modified versions of it
+that use the same license as the "OpenSSL" library), and distribute
+the linked executables.  You must obey the GNU General Public License
+in all respects for all of the code used other than "OpenSSL".  If you
+modify this file, you may extend this exception to your version of the
+file, but you are not obligated to do so.  If you do not wish to do
+so, delete this exception statement from your version.  */
 
 #ifndef HOST_H
 #define HOST_H
@@ -31,8 +41,6 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #endif
 #endif
 
-#undef INET6
-
 struct url;
 struct address_list;
 
@@ -42,7 +50,7 @@ struct address_list;
 typedef union {
        struct sockaddr     sa;   /* Generic but too small */
        struct sockaddr_in  sin;  /* IPv4 socket address */
-#ifdef INET6
+#ifdef ENABLE_IPV6
        struct sockaddr_in6 sin6; /* IPv6 socket address */
 #endif
 } wget_sockaddr;
@@ -55,7 +63,7 @@ typedef struct {
    addresses as IPv6 addresses.  IPv4 addresses are dynamically mapped
    to IPv6, i.e. stored in the format ::ffff:<Ipv4>.  */
 
-#ifdef INET6
+#ifdef ENABLE_IPV6
 # define MAX_IP_ADDRESS_SIZE 16
 #else
 # define MAX_IP_ADDRESS_SIZE 4
@@ -89,7 +97,7 @@ void wget_sockaddr_set_address PARAMS((wget_sockaddr *, int,
 void wget_sockaddr_set_port PARAMS((wget_sockaddr *, unsigned short));
 void *wget_sockaddr_get_addr PARAMS((wget_sockaddr *));
 unsigned short wget_sockaddr_get_port PARAMS((const wget_sockaddr *));
-int sockaddr_len PARAMS(());
+socklen_t sockaddr_len PARAMS(());
 void map_ipv4_to_ip PARAMS((ip4_address *, ip_address *));
 int  map_ip_to_ipv4 PARAMS((ip_address *, ip4_address *));