merge with 1.11.f

This commit is contained in:
Jim Meyering committed 1995-04-27 06:06:46 +00:00
1 parent 00c3a48bd7
commit 732fb15b45
2 files changed
+7 -4

No files matched your search

+5 -2
View File
@@ -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 @@ _getopt_internal (argc, argv, optstring, longopts, longind, long_only)
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')
{
+2 -2
View File
@@ -2865,7 +2865,7 @@ re_compile_fastmap (bufp)
/* 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 @@ re_match_2_internal (bufp, string1, size1, string2, size2, pos, regs, stop)
/* 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