summaryrefslogtreecommitdiff
path: root/Zend/zend_compile.c
diff options
context:
space:
mode:
authorFelipe Pena <felipe@php.net>2010-07-20 17:22:51 +0000
committerFelipe Pena <felipe@php.net>2010-07-20 17:22:51 +0000
commit4445503ae0d9348de3fc16a64ae57bbc0c29fd56 (patch)
treeb8d59e77bb81faad8c58deb31c34828612a243b6 /Zend/zend_compile.c
parent53293a6538917cc0b403e0b4224d7f58e825ca47 (diff)
downloadphp-git-experimental/lemon.tar.gz
- Reverted mem alloc function changeexperimental/lemon
- Fixed lineno on method declarations
Diffstat (limited to 'Zend/zend_compile.c')
-rw-r--r--Zend/zend_compile.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
index b1a376e9b1..bcb957bc30 100644
--- a/Zend/zend_compile.c
+++ b/Zend/zend_compile.c
@@ -6114,8 +6114,8 @@ int zendparse(TSRMLS_D) /* {{{ */
int token, halting = 0, old_exit_status;
void *pParser;
- if ((pParser = zend_lang_parseAlloc(_emalloc)) == NULL) {
- zend_lang_parseFree(pParser, _efree);
+ if ((pParser = zend_lang_parseAlloc(malloc)) == NULL) {
+ zend_lang_parseFree(pParser, free);
return 1;
}
@@ -6174,7 +6174,7 @@ again:
break;
}
}
- zend_lang_parseFree(pParser, _efree);
+ zend_lang_parseFree(pParser, free);
if (EG(exit_status) == 255) {
/* We got an E_PARSE */