summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/getopt1.c18
1 files changed, 8 insertions, 10 deletions
diff --git a/lib/getopt1.c b/lib/getopt1.c
index a6fdee5a5..2ceff8ec8 100644
--- a/lib/getopt1.c
+++ b/lib/getopt1.c
@@ -41,19 +41,19 @@
#endif
int
-getopt_long (int argc, char *__getopt_argv_const *argv, const char *options,
+getopt_long (int argc, char **argv, const char *options,
const struct option *long_options, int *opt_index)
{
- return _getopt_internal (argc, argv, options, long_options, opt_index, 0);
+ return _getopt_internal (argc, argv, options, long_options, opt_index, 0, 0);
}
int
-_getopt_long_r (int argc, char *__getopt_argv_const *argv, const char *options,
+_getopt_long_r (int argc, char **argv, const char *options,
const struct option *long_options, int *opt_index,
struct _getopt_data *d)
{
return _getopt_internal_r (argc, argv, options, long_options, opt_index,
- 0, d);
+ 0, 0, d);
}
/* Like getopt_long, but '-' as well as '--' can indicate a long option.
@@ -62,21 +62,19 @@ _getopt_long_r (int argc, char *__getopt_argv_const *argv, const char *options,
instead. */
int
-getopt_long_only (int argc, char *__getopt_argv_const *argv,
- const char *options,
+getopt_long_only (int argc, char **argv, const char *options,
const struct option *long_options, int *opt_index)
{
- return _getopt_internal (argc, argv, options, long_options, opt_index, 1);
+ return _getopt_internal (argc, argv, options, long_options, opt_index, 1, 0);
}
int
-_getopt_long_only_r (int argc, char *__getopt_argv_const *argv,
- const char *options,
+_getopt_long_only_r (int argc, char **argv, const char *options,
const struct option *long_options, int *opt_index,
struct _getopt_data *d)
{
return _getopt_internal_r (argc, argv, options, long_options, opt_index,
- 1, d);
+ 1, 0, d);
}