Automated merge.

[wget] / src / retr.h

diff --git a/src/retr.h b/src/retr.h
index 0f92026847a0e8e268a1189fa1ac5b15f43c1043..89a50221d9b5206a63f3846cb1e4be5a98923b56 100644 (file)
--- a/src/retr.h
+++ b/src/retr.h
@@ -31,6 +31,8 @@ as that of the covered work.  */
 #ifndef RETR_H
 #define RETR_H
 
 #ifndef RETR_H
 #define RETR_H
 

+#include "url.h"
+

 /* These global vars should be made static to retr.c and exported via
    functions! */
 extern SUM_SIZE_INT total_downloaded_bytes;
 /* These global vars should be made static to retr.c and exported via
    functions! */
 extern SUM_SIZE_INT total_downloaded_bytes;


@@ -52,7 +54,8 @@ typedef const char *(*hunk_terminator_t) (const char *, const char *, int);
 char *fd_read_hunk (int, hunk_terminator_t, long, long);
 char *fd_read_line (int);
 
 char *fd_read_hunk (int, hunk_terminator_t, long, long);
 char *fd_read_line (int);
 

-uerr_t retrieve_url (const char *, char **, char **, const char *, int *, bool);
+uerr_t retrieve_url (struct url *, const char *, char **, char **,
+                     const char *, int *, bool, struct iri *);

 uerr_t retrieve_from_file (const char *, bool, int *);
 
 const char *retr_rate (wgint, double);
 uerr_t retrieve_from_file (const char *, bool, int *);
 
 const char *retr_rate (wgint, double);


@@ -63,6 +66,6 @@ void sleep_between_retrievals (int);
 
 void rotate_backups (const char *);
 
 
 void rotate_backups (const char *);
 

-bool url_uses_proxy (const char *);
+bool url_uses_proxy (struct url *);

 
 #endif /* RETR_H */
 
 #endif /* RETR_H */