summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorph10 <ph10@2f5784b3-3f2a-0410-8824-cb99058d5e15>2010-10-31 14:15:04 +0000
committerph10 <ph10@2f5784b3-3f2a-0410-8824-cb99058d5e15>2010-10-31 14:15:04 +0000
commit3068fc9672b2eebd13eb232ec6e61bce9b65ec7a (patch)
tree483f04f83ba9abf131d34d31dbc967adee3fef45
parent6b21094f294885a4e1d4d255ceeecea503e56e17 (diff)
downloadpcre-3068fc9672b2eebd13eb232ec6e61bce9b65ec7a.tar.gz
Add casts needed for Visual Studio when NO_RECURSE is set.
git-svn-id: svn://vcs.exim.org/pcre/code/trunk@563 2f5784b3-3f2a-0410-8824-cb99058d5e15
-rw-r--r--ChangeLog2
-rw-r--r--pcre_exec.c4
2 files changed, 4 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 83e79ac..8f6e68a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -59,6 +59,8 @@ Version 8.11 10-Oct-2010
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
------------------------
diff --git a/pcre_exec.c b/pcre_exec.c
index f6984bd..b1d895d 100644
--- a/pcre_exec.c
+++ b/pcre_exec.c
@@ -294,7 +294,7 @@ argument of match(), which never changes. */
#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 storage. Set up the top-level frame here; others are obtained from the
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 */