Mercurial > gnulib
changeset 410:3021132524bb
merge with 1.11.f
| author | Jim Meyering <jim@meyering.net> |
|---|---|
| date | Thu, 27 Apr 1995 06:06:46 +0000 |
| parents | e9f87c3ee38a |
| children | 19dca1d4d7f6 |
| files | lib/getopt.c lib/regex.c |
| diffstat | 2 files changed, 7 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/lib/getopt.c Thu Apr 27 05:23:35 1995 +0000 +++ b/lib/getopt.c Thu Apr 27 06:06:46 1995 +0000 @@ -3,7 +3,7 @@ "Keep this file name-space clean" means, talk to roland@gnu.ai.mit.edu before changing it! - Copyright (C) 1987, 88, 89, 90, 91, 92, 93, 94 + Copyright (C) 1987, 88, 89, 90, 91, 92, 93, 94, 95 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it @@ -383,7 +383,10 @@ optarg = NULL; if (optind == 0) - optstring = _getopt_initialize (optstring); + { + optstring = _getopt_initialize (optstring); + optind = 1; /* Don't scan ARGV[0], the program name. */ + } if (nextchar == NULL || *nextchar == '\0') {
--- a/lib/regex.c Thu Apr 27 05:23:35 1995 +0000 +++ b/lib/regex.c Thu Apr 27 06:06:46 1995 +0000 @@ -2865,7 +2865,7 @@ /* This holds the pointer to the failure stack, when it is allocated relocatably. */ -#ifdef REL_ALLOC_STMT +#ifdef REL_ALLOC fail_stack_elt_t *failure_stack_ptr; #endif @@ -3518,7 +3518,7 @@ /* This holds the pointer to the failure stack, when it is allocated relocatably. */ -#ifdef REL_ALLOC_STMT +#ifdef REL_ALLOC fail_stack_elt_t *failure_stack_ptr; #endif