[svn] Merge of fix for bugs 20341 and 20410.

[wget] / src / progress.h

diff --git a/src/progress.h b/src/progress.h
index bbe63492dd295fc4c307ae8988f4747ec9425f69..2580196d7f31056c19de8f2f1eeff1dde2961c68 100644 (file)
--- a/src/progress.h
+++ b/src/progress.h
@@ -1,11 +1,11 @@
 /* Download progress.
-   Copyright (C) 2001 Free Software Foundation, Inc.
+   Copyright (C) 2001-2006 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,8 +14,7 @@ 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/>.
 
 In addition, as a special exception, the Free Software Foundation
 gives permission to link the code of its release of Wget with the
@@ -30,15 +29,15 @@ so, delete this exception statement from your version.  */
 #ifndef PROGRESS_H
 #define PROGRESS_H
 
-int valid_progress_implementation_p PARAMS ((const char *));
-void set_progress_implementation PARAMS ((const char *));
-void progress_schedule_redirect PARAMS ((void));
+bool valid_progress_implementation_p (const char *);
+void set_progress_implementation (const char *);
+void progress_schedule_redirect (void);
 
-void *progress_create PARAMS ((wgint, wgint));
-int progress_interactive_p PARAMS ((void *));
-void progress_update PARAMS ((void *, wgint, double));
-void progress_finish PARAMS ((void *, double));
+void *progress_create (wgint, wgint);
+bool progress_interactive_p (void *);
+void progress_update (void *, wgint, double);
+void progress_finish (void *, double);
 
-RETSIGTYPE progress_handle_sigwinch PARAMS ((int));
+void progress_handle_sigwinch (int);
 
 #endif /* PROGRESS_H */