Two small patches for utf8 I/O.

[platform/upstream/flac.git] / include / share / getopt.h

diff --git a/include/share/getopt.h b/include/share/getopt.h
index 024d72d..3e382d3 100644 (file)
--- a/include/share/getopt.h
+++ b/include/share/getopt.h
@@ -8,7 +8,7 @@
        GNU/Linux, Darwin, AND Solaris please submit it on the project page:
                http://sourceforge.net/projects/flac
 
-       In the meantime I have munged the global symbols and remove gates
+       In the meantime I have munged the global symbols and removed gates
        around code, while at the same time trying to touch the original as
        little as possible.
 */
@@ -28,8 +28,8 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.  */
 
 #ifndef SHARE__GETOPT_H
 #define SHARE__GETOPT_H
@@ -146,23 +146,23 @@ struct share__option
 /* Many other libraries have conflicting prototypes for getopt, with
    differences in the consts, in stdlib.h.  To avoid compilation
    errors, only prototype getopt for the GNU C library.  */
-extern int share__getopt (int __argc, char *const *__argv, const char *__shortopts);
+extern int share__getopt (int argc, char *const *argv, const char *shortopts);
 /*[JEC] was:# else*/ /* not __GNU_LIBRARY__ */
 /*[JEC] was:extern int getopt ();*/
 /*[JEC] was:# endif*/ /* __GNU_LIBRARY__ */
 
 /*[JEC] was:# ifndef __need_getopt*/
-extern int share__getopt_long (int __argc, char *const *__argv, const char *__shortopts,
-                       const struct share__option *__longopts, int *__longind);
-extern int share__getopt_long_only (int __argc, char *const *__argv,
-                            const char *__shortopts,
-                            const struct share__option *__longopts, int *__longind);
+extern int share__getopt_long (int argc, char *const *argv, const char *shortopts,
+                       const struct share__option *longopts, int *longind);
+extern int share__getopt_long_only (int argc, char *const *argv,
+                            const char *shortopts,
+                            const struct share__option *longopts, int *longind);
 
 /* Internal only.  Users should not call this directly.  */
-extern int share___getopt_internal (int __argc, char *const *__argv,
-                            const char *__shortopts,
-                            const struct share__option *__longopts, int *__longind,
-                            int __long_only);
+extern int share___getopt_internal (int argc, char *const *argv,
+                            const char *shortopts,
+                            const struct share__option *longopts, int *longind,
+                            int long_only);
 /*[JEC] was:# endif*/
 /*[JEC] was:#else*/ /* not __STDC__ */
 /*[JEC] was:extern int getopt ();*/