Fix build when libpsl is not available

[wget] / src / host.h

diff --git a/src/host.h b/src/host.h
index de71a406d41ef2a35c1196984e979d7b47e8de24..84f3d137f092f7086e259828e0635203ec4f18ba 100644 (file)
--- a/src/host.h
+++ b/src/host.h
@@ -1,11 +1,13 @@
 /* Declarations for host.c
 /* Declarations for host.c

-   Copyright (C) 1996-2005 Free Software Foundation, Inc.
+   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+   2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation,
+   Inc.

 
 This file is part of GNU Wget.
 
 GNU Wget is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 
 This file is part of GNU Wget.
 
 GNU Wget is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by

-the Free Software Foundation; either version 2 of the License, or
+the Free Software Foundation; either version 3 of the License, or

  (at your option) any later version.
 
 GNU Wget is distributed in the hope that it will be useful,
  (at your option) any later version.
 
 GNU Wget is distributed in the hope that it will be useful,


@@ -14,26 +16,30 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 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.,
-51 Franklin St, Fifth Floor, Boston, MA 02110-1301 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.  */
+along with Wget.  If not, see <http://www.gnu.org/licenses/>.
+
+Additional permission under GNU GPL version 3 section 7
+
+If you modify this program, or any covered work, by linking or
+combining it with the OpenSSL project's OpenSSL library (or a
+modified version of that library), containing parts covered by the
+terms of the OpenSSL or SSLeay licenses, the Free Software Foundation
+grants you additional permission to convey the resulting work.
+Corresponding Source for a non-source form of such a combination
+shall include the source code for the parts of OpenSSL used as well
+as that of the covered work.  */

 
 #ifndef HOST_H
 #define HOST_H
 
 #ifdef WINDOWS
 
 #ifndef HOST_H
 #define HOST_H
 
 #ifdef WINDOWS

-# include <winsock.h>
+# include <winsock2.h>

 #else
 #else

-# include <netdb.h>
+# ifdef __VMS
+#  include "vms_ip.h"
+# else /* def __VMS */
+#  include <netdb.h>
+# endif /* def __VMS [else] */

 # include <sys/socket.h>
 # include <netinet/in.h>
 #ifndef __BEOS__
 # include <sys/socket.h>
 # include <netinet/in.h>
 #ifndef __BEOS__


@@ -52,9 +58,9 @@ typedef struct {
 
   /* The actual data, in the form of struct in_addr or in6_addr: */
   union {
 
   /* The actual data, in the form of struct in_addr or in6_addr: */
   union {

-    struct in_addr d4;         /* IPv4 address */
+    struct in_addr d4;      /* IPv4 address */

 #ifdef ENABLE_IPV6
 #ifdef ENABLE_IPV6

-    struct in6_addr d6;                /* IPv6 address */
+    struct in6_addr d6;     /* IPv6 address */

 #endif
   } data;
 
 #endif
   } data;
 


@@ -92,6 +98,8 @@ const char *print_address (const ip_address *);
 bool is_valid_ipv6_address (const char *, const char *);
 #endif
 
 bool is_valid_ipv6_address (const char *, const char *);
 #endif
 

+bool is_valid_ip_address (const char *name);
+

 bool accept_domain (struct url *);
 bool sufmatch (const char **, const char *);
 
 bool accept_domain (struct url *);
 bool sufmatch (const char **, const char *);