Mercurial > hg > octave-nkf > gnulib-hg
changeset 5429:1b54fe747ab9
(_getopt_initialize, _getopt_internal_r, _getopt_internal, getopt):
Use __getopt_argv_const.
author | Paul Eggert <eggert@cs.ucla.edu> |
---|---|
date | Thu, 11 Nov 2004 21:15:33 +0000 |
parents | e6b5cc694a7c |
children | 54760e095396 |
files | lib/getopt.c |
diffstat | 1 files changed, 10 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/lib/getopt.c +++ b/lib/getopt.c @@ -250,8 +250,8 @@ /* Initialize the internal data when the first call is made. */ static const char * -_getopt_initialize (int argc, char *const *argv, const char *optstring, - struct _getopt_data *d) +_getopt_initialize (int argc, char *__getopt_argv_const *argv, + const char *optstring, struct _getopt_data *d) { /* Start processing options with ARGV-element 1 (since ARGV-element 0 is the program name); the sequence of previously skipped @@ -356,8 +356,9 @@ if the `flag' field is zero. The elements of ARGV aren't really const, because we permute them. - But we pretend they're const in the prototype to be compatible - with other systems. + If __getopt_argv_const is defined to const, pretend they're + const in the prototype to be compatible with Posix. + But tell the truth if __getopt_argv_const is defined to empty. LONGOPTS is a vector of `struct option' terminated by an element containing a name which is zero. @@ -370,7 +371,8 @@ long-named options. */ int -_getopt_internal_r (int argc, char *const *argv, const char *optstring, +_getopt_internal_r (int argc, char *__getopt_argv_const *argv, + const char *optstring, const struct option *longopts, int *longind, int long_only, struct _getopt_data *d) { @@ -1135,7 +1137,8 @@ } int -_getopt_internal (int argc, char *const *argv, const char *optstring, +_getopt_internal (int argc, char *__getopt_argv_const *argv, + const char *optstring, const struct option *longopts, int *longind, int long_only) { int result; @@ -1154,7 +1157,7 @@ } int -getopt (int argc, char *const *argv, const char *optstring) +getopt (int argc, char *__getopt_argv_const *argv, const char *optstring) { return _getopt_internal (argc, argv, optstring, (const struct option *) 0,