X-Git-Url: http://sjero.net/git/?p=wget;a=blobdiff_plain;f=src%2Fprogress.h;h=778dfa514b8450e22efd814b711303679b1062ca;hp=50cd211627aefec351248249161637ee94c59522;hb=8c2fd06ba80b5312b4540859d452664450ec054f;hpb=cdcf67a5bdae9c56d263ebf7608b52701851cf22

diff --git a/src/progress.h b/src/progress.h
index 50cd2116..778dfa51 100644
--- a/src/progress.h
+++ b/src/progress.h
@@ -1,11 +1,12 @@
 /* Download progress.
-   Copyright (C) 2001 Free Software Foundation, Inc.
+   Copyright (C) 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
-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,
@@ -14,14 +15,31 @@ 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
-along with Wget; if not, write to the Free Software
-Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+along with Wget.  If not, see <http://www.gnu.org/licenses/>.
 
-int valid_progress_implementation_p PARAMS ((const char *));
-void set_progress_implementation PARAMS ((const char *));
+Additional permission under GNU GPL version 3 section 7
 
-void *progress_create PARAMS ((long, long));
-void progress_update PARAMS ((void *, long));
-void progress_finish PARAMS ((void *));
+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.  */
 
-RETSIGTYPE progress_handle_sigwinch PARAMS ((int));
+#ifndef PROGRESS_H
+#define PROGRESS_H
+
+bool valid_progress_implementation_p (const char *);
+void set_progress_implementation (const char *);
+void progress_schedule_redirect (void);
+
+void *progress_create (const char *, wgint, wgint);
+bool progress_interactive_p (void *);
+void progress_update (void *, wgint, double);
+void progress_finish (void *, double);
+
+void progress_handle_sigwinch (int);
+
+#endif /* PROGRESS_H */