Revision: 563
http://vcs.pcre.org/viewvc?view=rev&revision=563
Author: ph10
Date: 2010-10-31 14:15:04 +0000 (Sun, 31 Oct 2010)
Log Message:
-----------
Add casts needed for Visual Studio when NO_RECURSE is set.
Modified Paths:
--------------
code/trunk/ChangeLog
code/trunk/pcre_exec.c
Modified: code/trunk/ChangeLog
===================================================================
--- code/trunk/ChangeLog 2010-10-31 14:06:43 UTC (rev 562)
+++ code/trunk/ChangeLog 2010-10-31 14:15:04 UTC (rev 563)
@@ -59,7 +59,9 @@
9. Added --match-limit and --recursion-limit to pcregrep.
+10. Added two casts needed to build with Visual Studio when NO_RECURSE is set.
+
Version 8.10 25-Jun-2010
------------------------
Modified: code/trunk/pcre_exec.c
===================================================================
--- code/trunk/pcre_exec.c 2010-10-31 14:06:43 UTC (rev 562)
+++ code/trunk/pcre_exec.c 2010-10-31 14:15:04 UTC (rev 563)
@@ -294,7 +294,7 @@
#define RMATCH(ra,rb,rc,rd,re,rf,rg,rw)\
{\
- heapframe *newframe = (pcre_stack_malloc)(sizeof(heapframe));\
+ heapframe *newframe = (heapframe *)(pcre_stack_malloc)(sizeof(heapframe));\
if (newframe == NULL) RRETURN(PCRE_ERROR_NOMEMORY);\
frame->Xwhere = rw; \
newframe->Xeptr = ra;\
@@ -489,7 +489,7 @@
heap whenever RMATCH() does a "recursion". See the macro definitions above. */
#ifdef NO_RECURSE
-heapframe *frame = (pcre_stack_malloc)(sizeof(heapframe));
+heapframe *frame = (heapframe *)(pcre_stack_malloc)(sizeof(heapframe));
if (frame == NULL) RRETURN(PCRE_ERROR_NOMEMORY);
frame->Xprevframe = NULL; /* Marks the top level */
