Mercurial > hg > octave-nkf > gnulib-hg
changeset 2852:69f37fd70087
(_getopt_internal): Update from glibc.
author | Jim Meyering <jim@meyering.net> |
---|---|
date | Wed, 06 Sep 2000 20:04:06 +0000 |
parents | d2bf7ab893af |
children | d0457bbc7647 |
files | lib/getopt.c |
diffstat | 1 files changed, 8 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/lib/getopt.c +++ b/lib/getopt.c @@ -27,13 +27,13 @@ #ifdef HAVE_CONFIG_H # include <config.h> -#else -# if !defined __STDC__ || !__STDC__ +#endif + +#if !defined __STDC__ || !__STDC__ /* This is a separate conditional since some stdc systems reject `defined (const)'. */ -# ifndef const -# define const -# endif +# ifndef const +# define const # endif #endif @@ -671,7 +671,9 @@ pfound = p; indfound = option_index; } - else + else if (pfound->has_arg != p->has_arg + || pfound->flag != p->flag + || pfound->val != p->val) /* Second or later nonexact match found. */ ambig = 1; }