Remove remaining (now unused) code under HEAP_MATCH_RECURSE, and make the build

systems give a warning of the obsolescence of --disable-stack-for-recursion and 
the equivalent CMake setting. 


git-svn-id: svn://vcs.exim.org/pcre2/code/trunk@676 6239d852-aaf2-0410-a92c-79f79f948069

1 files changed, 3 insertions, 9 deletions

diff --git a/src/pcre2_context.c b/src/pcre2_context.c
index ae050fe..448b71a 100644
--- a/src/pcre2_context.c
+++ b/src/pcre2_context.c
@@ -161,9 +161,6 @@ when no context is supplied to a match function. */
 
 const pcre2_match_context PRIV(default_match_context) = {
   { default_malloc, default_free, NULL },
-#ifdef HEAP_MATCH_RECURSE
-  { default_malloc, default_free, NULL },
-#endif
 #ifdef SUPPORT_JIT
   NULL,
   NULL,
@@ -370,21 +367,18 @@ mcontext->recursion_limit = limit;
 return 0;
 }
 
+/* This function became obsolete at release 10.30. It is kept as a no-op for 
+backwards compatibility. */
+
 PCRE2_EXP_DEFN int PCRE2_CALL_CONVENTION
 pcre2_set_recursion_memory_management(pcre2_match_context *mcontext,
   void *(*mymalloc)(size_t, void *), void (*myfree)(void *, void *),
   void *mydata)
 {
-#ifdef HEAP_MATCH_RECURSE
-mcontext->stack_memctl.malloc = mymalloc;
-mcontext->stack_memctl.free = myfree;
-mcontext->stack_memctl.memory_data = mydata;
-#else
 (void)mcontext;
 (void)mymalloc;
 (void)myfree;
 (void)mydata;
-#endif
 return 0;
 }