Automated merge.

diff --git a/src/ChangeLog b/src/ChangeLog
index a5beaa2eec211852ac69c9244a56ce85d4ff815e..10e80080626d6736eaca65beb2a2c0602ffd02a2 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2009-09-05  Steven Schubiger  <stsc@member.fsf.org>
+
+       * retr.h: Declare set_local_file() to avoid build warnings.
+
 2009-09-05  Gisle Vanem  <gvanem@broadpark.no>
 
        * connect.c, init.c, main.c, openssl.c, options.h:  Replace

diff --git a/src/retr.h b/src/retr.h
index 856e7bc8a044e3fabe46ef0e65a2a23f35128eb9..f50c99802fe2c110540a5c09c44683e066a47e3e 100644 (file)
--- a/src/retr.h
+++ b/src/retr.h
@@ -67,4 +67,6 @@ void rotate_backups (const char *);
 
 bool url_uses_proxy (struct url *);
 
+void set_local_file (const char **, const char *);
+
 #endif /* RETR_H */