Fix build when libpsl is not available

[wget] / src / html-parse.h

diff --git a/src/html-parse.h b/src/html-parse.h
index dedca0afc10be2df4346f9cc22306550586c9e31..68e94b3f169a9474f97b6fc4e6517480cf14fc35 100644 (file)
--- a/src/html-parse.h
+++ b/src/html-parse.h
@@ -1,11 +1,12 @@
 /* Declarations for html-parse.c.
 /* Declarations for html-parse.c.

-   Copyright (C) 1998 Free Software Foundation, Inc.
+   Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+   2007, 2008, 2009, 2010, 2011 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,25 +15,25 @@ 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., 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.  */
+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 HTML_PARSE_H
 #define HTML_PARSE_H
 
 struct attr_pair {
 
 #ifndef HTML_PARSE_H
 #define HTML_PARSE_H
 
 struct attr_pair {

-  char *name;                  /* attribute name */
-  char *value;                 /* attribute value */
+  char *name;           /* attribute name */
+  char *value;          /* attribute value */

 
   /* Needed for URL conversion; the places where the value begins and
      ends, including the quotes and everything. */
 
   /* Needed for URL conversion; the places where the value begins and
      ends, including the quotes and everything. */


@@ -44,16 +45,19 @@ struct attr_pair {
 };
 
 struct taginfo {
 };
 
 struct taginfo {

-  char *name;                  /* tag name */
-  int end_tag_p;               /* whether this is an end-tag */
-  int nattrs;                  /* number of attributes */
-  struct attr_pair *attrs;     /* attributes */
+  char *name;                   /* tag name */
+  int end_tag_p;                /* whether this is an end-tag */
+  int nattrs;                   /* number of attributes */
+  struct attr_pair *attrs;      /* attributes */
+
+  const char *start_position;   /* start position of tag */
+  const char *end_position;     /* end position of tag */

 
 

-  const char *start_position;  /* start position of tag */
-  const char *end_position;    /* end position of tag */
+  const char *contents_begin;   /* delimiters of tag contents */
+  const char *contents_end;     /* only valid if end_tag_p */

 };
 
 };
 

-struct hash_table;             /* forward declaration */
+struct hash_table;              /* forward declaration */

 
 /* Flags for map_html_tags: */
 #define MHT_STRICT_COMMENTS  1  /* use strict comment interpretation */
 
 /* Flags for map_html_tags: */
 #define MHT_STRICT_COMMENTS  1  /* use strict comment interpretation */


@@ -61,7 +65,7 @@ struct hash_table;            /* forward declaration */
                                    <a href=" foo "> as "foo" */
 
 void map_html_tags (const char *, int,
                                    <a href=" foo "> as "foo" */
 
 void map_html_tags (const char *, int,

-                   void (*) (struct taginfo *, void *), void *, int,
-                   const struct hash_table *, const struct hash_table *);
+                    void (*) (struct taginfo *, void *), void *, int,
+                    const struct hash_table *, const struct hash_table *);

 
 #endif /* HTML_PARSE_H */
 
 #endif /* HTML_PARSE_H */