From: Richard M. Stallman <rms@gnu.org>
Date: Fri, 7 Jul 1995 13:20:16 +0000 (+0000)
Subject: Don't use relocatable allocator.
X-Git-Tag: emacs-19.34~3381
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=4297555ed2ca9ee4d6eae0f29030af62c31cc5c4;p=emacs.git

Don't use relocatable allocator.
---

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