--- cvsroot/gvpe/lib/getopt.h	2003/03/01 15:53:02	1.1
+++ cvsroot/gvpe/lib/getopt.h	2005/04/26 00:55:55	1.4
@@ -4,7 +4,9 @@
 NOTE: The canonical source of this file is maintained with the GNU C Library.
 Bugs can be reported to bug-glibc@prep.ai.mit.edu.
 
-This program is free software; you can redistribute it and/or modify it
+This file is part of GVPE.
+
+    GVPE 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, or (at your option) any
 later version.
@@ -15,8 +17,8 @@
 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. 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+along with gvpe; if not, write to the Free Software
+Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
 #ifndef _GETOPT_H
@@ -105,7 +107,6 @@
    errors, only prototype getopt for the GNU C library.  */
 extern int getopt (int argc, char *const *argv, const char *shortopts);
 #else /* not __GNU_LIBRARY__ */
-extern int getopt ();
 #endif /* __GNU_LIBRARY__ */
 extern int getopt_long (int argc, char *const *argv, const char *shortopts,
 		        const struct option *longopts, int *longind);
@@ -119,7 +120,6 @@
 		             const struct option *longopts, int *longind,
 			     int long_only);
 #else /* not __STDC__ */
-extern int getopt ();
 extern int getopt_long ();
 extern int getopt_long_only ();