* gdb.base/Makefile.in (clean): Remove callf-info.exp.

[deliverable/binutils-gdb.git] / gdb / regex.c

diff --git a/gdb/regex.c b/gdb/regex.c
index 9b6dc5b9688e66f0d3284c72d53f0abf34d42379..fc31eba9a602a686729b7c7cf46fd2c2c4085634 100644 (file)
--- a/gdb/regex.c
+++ b/gdb/regex.c
@@ -93,8 +93,16 @@ init_syntax_once ()
 
 #define BYTEWIDTH 8
 
-#ifndef SIGN_EXTEND_CHAR
-#define SIGN_EXTEND_CHAR(x) (x)
+/* We remove any previous definition of `SIGN_EXTEND_CHAR',
+   since ours (we hope) works properly with all combinations of
+   machines, compilers, `char' and `unsigned char' argument types.
+   (Per Bothner suggested the basic approach.)  */
+#undef SIGN_EXTEND_CHAR
+#if __STDC__
+#define SIGN_EXTEND_CHAR(c) ((signed char) (c))
+#else  /* not __STDC__ */
+/* As in Harbison and Steele.  */
+#define SIGN_EXTEND_CHAR(c) ((((unsigned char) (c)) ^ 128) - 128)
 #endif
 \f
 static int obscure_syntax = 0;
@@ -868,6 +876,11 @@ re_compile_fastmap (bufp)
                  fastmap[j] = 1;
              }
          break;
+       case unused:
+       case syntaxspec:
+       case notsyntaxspec:
+       default:
+         break;
        }
 
       /* Get here means we have successfully found the possible starting characters
@@ -1521,6 +1534,14 @@ re_match_2 (pbufp, string1, size1, string2, size2, pos, regs, mstop)
              while (--mcnt);
            }
          break;
+       case unused:
+       case before_dot:
+       case at_dot:
+       case after_dot:
+       case syntaxspec:
+       case notsyntaxspec:
+       default:
+         break;
        }
       continue;    /* Successfully matched one pattern command; keep matching */