X-Git-Url: http://sjero.net/git/?p=wget;a=blobdiff_plain;f=src%2Fptimer.h;h=8df426af5ed75ece019fbf949674129251ba18b3;hp=481c0f1b6a29c5ac1175749e86c8df4ba033c8c3;hb=38a7829dcb4eb5dba28dbf0f05c6a80fea9217f8;hpb=14a2d25b2e0f6d565c3ca69ab81d09bfa775d083

diff --git a/src/ptimer.h b/src/ptimer.h
index 481c0f1b..8df426af 100644
--- a/src/ptimer.h
+++ b/src/ptimer.h
@@ -1,11 +1,12 @@
 /* Declarations for ptimer.c.
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 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,18 +15,18 @@ 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.
-
-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.  */
+along with Wget.  If not, see <http://www.gnu.org/licenses/>.
+
+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 PTIMER_H
 #define PTIMER_H
@@ -33,13 +34,13 @@ so, delete this exception statement from your version.  */
 struct ptimer;			/* forward declaration; all struct
                                    members are private */
 
-struct ptimer *ptimer_new PARAMS ((void));
-void ptimer_destroy PARAMS ((struct ptimer *));
+struct ptimer *ptimer_new (void);
+void ptimer_destroy (struct ptimer *);
 
-void ptimer_reset PARAMS ((struct ptimer *));
-double ptimer_measure PARAMS ((struct ptimer *));
-double ptimer_read PARAMS ((const struct ptimer *));
+void ptimer_reset (struct ptimer *);
+double ptimer_measure (struct ptimer *);
+double ptimer_read (const struct ptimer *);
 
-double ptimer_resolution PARAMS ((void));
+double ptimer_resolution (void);
 
 #endif /* PTIMER_H */