summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIlia Alshanetsky <iliaa@php.net>2003-12-17 16:34:10 +0000
committerIlia Alshanetsky <iliaa@php.net>2003-12-17 16:34:10 +0000
commit664268b037a5c8442f2cde9fc19cc44c63aa33c3 (patch)
treeb71bbe275861d86731d0dabcf690047f81e92944
parentae4a09b239648c6893c14b48a92562da025b0240 (diff)
downloadphp-git-664268b037a5c8442f2cde9fc19cc44c63aa33c3.tar.gz
Always user Zend memory allocation wrappers.
-rw-r--r--ext/tidy/tidy.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/ext/tidy/tidy.c b/ext/tidy/tidy.c
index c7c43bbe11..4c6f10a51f 100644
--- a/ext/tidy/tidy.c
+++ b/ext/tidy/tidy.c
@@ -156,7 +156,6 @@ zend_module_entry tidy_module_entry = {
ZEND_GET_MODULE(tidy)
#endif
-#if MEMORY_LIMIT
void *php_tidy_malloc(size_t len)
{
return emalloc(len);
@@ -171,7 +170,7 @@ void php_tidy_free(void *buf)
{
efree(buf);
}
-#endif
+
void php_tidy_panic(ctmbstr msg)
{
zend_error(E_ERROR, "Could not allocate memory for tidy! (Reason: %s)", (char *)msg);
@@ -297,11 +296,9 @@ static void tidy_object_new(zend_class_entry *class_type, zend_object_handlers *
break;
case is_doc:
-#if MEMORY_LIMIT
tidySetMallocCall(php_tidy_malloc);
tidySetReallocCall(php_tidy_realloc);
tidySetFreeCall(php_tidy_free);
-#endif
tidySetPanicCall(php_tidy_panic);
intern->ptdoc = emalloc(sizeof(PHPTidyDoc));