(_getopt_internal, _getopt_internal_r, _getopt_long_r, _getopt_long_only_r):

Use __getopt_argv_count.

diff --git a/lib/getopt_int.h b/lib/getopt_int.h
index 0c5eddeca964eab9fa1225306ab4970fafaf7e3b..158a53a09194b876b6df9caa605ee59da92a2d1b 100644 (file)
--- a/lib/getopt_int.h
+++ b/lib/getopt_int.h
@@ -20,7 +20,7 @@
 #ifndef _GETOPT_INT_H
 #define _GETOPT_INT_H  1
 
-extern int _getopt_internal (int ___argc, char *const *___argv,
+extern int _getopt_internal (int ___argc, char *__getopt_argv_const *___argv,
                             const char *__shortopts,
                             const struct option *__longopts, int *__longind,
                             int __long_only);
@@ -110,17 +110,18 @@ struct _getopt_data
    default values and to clear the initialization flag.  */
 #define _GETOPT_DATA_INITIALIZER       { 1, 1 }
 
-extern int _getopt_internal_r (int ___argc, char *const *___argv,
+extern int _getopt_internal_r (int ___argc, char *__getopt_argv_const *___argv,
                               const char *__shortopts,
                               const struct option *__longopts, int *__longind,
                               int __long_only, struct _getopt_data *__data);
 
-extern int _getopt_long_r (int ___argc, char *const *___argv,
+extern int _getopt_long_r (int ___argc, char *__getopt_argv_const *___argv,
                           const char *__shortopts,
                           const struct option *__longopts, int *__longind,
                           struct _getopt_data *__data);
 
-extern int _getopt_long_only_r (int ___argc, char *const *___argv,
+extern int _getopt_long_only_r (int ___argc,
+                               char *__getopt_argv_const *___argv,
                                const char *__shortopts,
                                const struct option *__longopts,
                                int *__longind,