(getopt_long, _getopt_long_r, getopt_long_only, _getopt_long_only_r):

Use __getopt_argv_const.

diff --git a/lib/getopt1.c b/lib/getopt1.c
index 706f59c08377edabb0ff72f84d168828db20effa..a6fdee5a5762ebb53fb8dc678fbd2ecdbe80ed53 100644 (file)
--- a/lib/getopt1.c
+++ b/lib/getopt1.c
@@ -41,14 +41,14 @@
 #endif
 
 int
-getopt_long (int argc, char *const *argv, const char *options,
+getopt_long (int argc, char *__getopt_argv_const *argv, const char *options,
             const struct option *long_options, int *opt_index)
 {
   return _getopt_internal (argc, argv, options, long_options, opt_index, 0);
 }
 
 int
-_getopt_long_r (int argc, char *const *argv, const char *options,
+_getopt_long_r (int argc, char *__getopt_argv_const *argv, const char *options,
                const struct option *long_options, int *opt_index,
                struct _getopt_data *d)
 {
@@ -62,14 +62,16 @@ _getopt_long_r (int argc, char *const *argv, const char *options,
    instead.  */
 
 int
-getopt_long_only (int argc, char *const *argv, const char *options,
+getopt_long_only (int argc, char *__getopt_argv_const *argv,
+                 const char *options,
                  const struct option *long_options, int *opt_index)
 {
   return _getopt_internal (argc, argv, options, long_options, opt_index, 1);
 }
 
 int
-_getopt_long_only_r (int argc, char *const *argv, const char *options,
+_getopt_long_only_r (int argc, char *__getopt_argv_const *argv,
+                    const char *options,
                     const struct option *long_options, int *opt_index,
                     struct _getopt_data *d)
 {