merge with 1.11.f

diff --git a/lib/getopt.c b/lib/getopt.c
index 57fd398ef9bbb4da8de46b4f830abf2169c641d6..de30ec79fec56abda44edbe0882096361c076b7a 100644 (file)
--- a/lib/getopt.c
+++ b/lib/getopt.c
@@ -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')
     {

diff --git a/lib/regex.c b/lib/regex.c
index 37e67c6beca0d42585d248522c16d6f106ab3a3d..ec1b17ddf1a3f668e1a610df5e4a3ac3461927e0 100644 (file)
--- a/lib/regex.c
+++ b/lib/regex.c
@@ -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