# HG changeset patch # User Glenn Morris # Date 1189581692 0 # Node ID 70ea273ac2379d1dacd4860532b7a48df056db17 # Parent adb213894976e3f3dbd2cb884e86748fe56a2149 (C_ALLOCA): Remove all references and code that was only used when this was defined. diff -r adb213894976 -r 70ea273ac237 src/regex.c --- a/src/regex.c Wed Sep 12 07:19:55 2007 +0000 +++ b/src/regex.c Wed Sep 12 07:21:32 2007 +0000 @@ -1366,18 +1366,12 @@ /* Normally, this is fine. */ #define MATCH_MAY_ALLOCATE -/* When using GNU C, we are not REALLY using the C alloca, no matter - what config.h may say. So don't take precautions for it. */ -#ifdef __GNUC__ -# undef C_ALLOCA -#endif - /* The match routines may not allocate if (1) they would do it with malloc and (2) it's not safe for them to use malloc. Note that if REL_ALLOC is defined, matching would not use malloc for the failure stack, but we would still use it for the register vectors; so REL_ALLOC should not affect this. */ -#if (defined C_ALLOCA || defined REGEX_MALLOC) && defined emacs +#if defined REGEX_MALLOC && defined emacs # undef MATCH_MAY_ALLOCATE #endif @@ -4454,11 +4448,6 @@ val = re_match_2_internal (bufp, string1, size1, string2, size2, startpos, regs, stop); -#ifndef REGEX_MALLOC -# ifdef C_ALLOCA - alloca (0); -# endif -#endif if (val >= 0) return startpos; @@ -4894,9 +4883,6 @@ { int result = re_match_2_internal (bufp, NULL, 0, (re_char*) string, size, pos, regs, size); -# if defined C_ALLOCA && !defined REGEX_MALLOC - alloca (0); -# endif return result; } WEAK_ALIAS (__re_match, re_match) @@ -4942,9 +4928,6 @@ result = re_match_2_internal (bufp, (re_char*) string1, size1, (re_char*) string2, size2, pos, regs, stop); -#if defined C_ALLOCA && !defined REGEX_MALLOC - alloca (0); -#endif return result; } WEAK_ALIAS (__re_match_2, re_match_2)