summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorRichard M. Stallman <rms@gnu.org>1995-07-07 13:20:16 +0000
committerRichard M. Stallman <rms@gnu.org>1995-07-07 13:20:16 +0000
commit08a5b2723f4d20f140f37128d1aad522a58f6036 (patch)
tree93a1875307a9c8aa1c25a6b0d6c1b44c72102c2b /src
parent4dc30e8e96f882ff2f4075b39d4859145f7f17a2 (diff)
downloademacs-08a5b2723f4d20f140f37128d1aad522a58f6036.tar.gz
Don't use relocatable allocator.
Diffstat (limited to 'src')
-rw-r--r--src/regex.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/regex.c b/src/regex.c
index 144c984e98c..1af5ab0edca 100644
--- a/src/regex.c
+++ b/src/regex.c
@@ -260,7 +260,8 @@ char *alloca ();
/* Define how to allocate the failure stack. */
-#ifdef REL_ALLOC
+#if defined (REL_ALLOC) && !defined (REGEX_MALLOC)
+
#define REGEX_ALLOCATE_STACK(size) \
r_alloc (&failure_stack_ptr, (size))
#define REGEX_REALLOCATE_STACK(source, osize, nsize) \
@@ -268,7 +269,7 @@ char *alloca ();
#define REGEX_FREE_STACK(ptr) \
r_alloc_free (&failure_stack_ptr)
-#else /* not REL_ALLOC */
+#else /* not using relocating allocator */
#ifdef REGEX_MALLOC
@@ -286,7 +287,7 @@ char *alloca ();
#define REGEX_FREE_STACK(arg)
#endif /* not REGEX_MALLOC */
-#endif /* not REL_ALLOC */
+#endif /* not using relocating allocator */
/* True if `size1' is non-NULL and PTR is pointing anywhere inside