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

[wget] / src / netrc.h

diff --git a/src/netrc.h b/src/netrc.h
index ec10cf13bd1e566470b28c52796d86d541e5521e..1b26a0cbae8ce913496c87165bd580f6b2a9e8df 100644 (file)
--- a/src/netrc.h
+++ b/src/netrc.h
@@ -1,21 +1,33 @@
 /* Declarations for netrc.c
-   Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+   Copyright (C) 1996, 1996, 1997 Free Software Foundation, Inc.
 
-This file is part of Wget.
+This file is part of GNU Wget.
 
-This program is free software; you can redistribute it and/or modify
+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.
 
-This program is distributed in the hope that it will be useful,
+GNU Wget is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 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 this program; 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
+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.  */
+
+#ifndef NETRC_H
+#define NETRC_H
 
 typedef struct _acc_t
 {
@@ -26,5 +38,7 @@ typedef struct _acc_t
   struct _acc_t *next;
 } acc_t;
 
-void search_netrc PARAMS((const char *, const char **, const char **, int));
-void free_netrc PARAMS((acc_t *l));
+void search_netrc (const char *, const char **, const char **, int);
+void free_netrc (acc_t *l);
+
+#endif /* NETRC_H */