X-Git-Url: http://sjero.net/git/?p=wget;a=blobdiff_plain;f=src%2Fprogress.h;h=778dfa514b8450e22efd814b711303679b1062ca;hp=c5862ed08ae517e573c33598dd96521a01438503;hb=8c2fd06ba80b5312b4540859d452664450ec054f;hpb=5dd09d9ba51f039acb217bf2fd5c7fdd340ac946 diff --git a/src/progress.h b/src/progress.h index c5862ed0..778dfa51 100644 --- a/src/progress.h +++ b/src/progress.h @@ -1,6 +1,6 @@ /* Download progress. - Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007 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. @@ -17,15 +17,16 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with Wget. If not, see . -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. */ +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 PROGRESS_H #define PROGRESS_H @@ -34,7 +35,7 @@ bool valid_progress_implementation_p (const char *); void set_progress_implementation (const char *); void progress_schedule_redirect (void); -void *progress_create (wgint, wgint); +void *progress_create (const char *, wgint, wgint); bool progress_interactive_p (void *); void progress_update (void *, wgint, double); void progress_finish (void *, double);