summaryrefslogtreecommitdiff
path: root/Zend/zend_alloc.h
diff options
context:
space:
mode:
authorZeev Suraski <zeev@php.net>2001-07-28 10:51:54 +0000
committerZeev Suraski <zeev@php.net>2001-07-28 10:51:54 +0000
commitb4f3b9d3ce9f55cf040fb5aa8f201c64646cab43 (patch)
tree8d4a54f5763387c1a31a4e382e07138bcfde4857 /Zend/zend_alloc.h
parent633a1c30d115baa6436883ff44fd5abb127e0a7f (diff)
downloadphp-git-b4f3b9d3ce9f55cf040fb5aa8f201c64646cab43.tar.gz
Redesigned thread safety mechanism - nua nua
Diffstat (limited to 'Zend/zend_alloc.h')
-rw-r--r--Zend/zend_alloc.h5
1 files changed, 1 insertions, 4 deletions
diff --git a/Zend/zend_alloc.h b/Zend/zend_alloc.h
index 964e2e4ce2..7afda73737 100644
--- a/Zend/zend_alloc.h
+++ b/Zend/zend_alloc.h
@@ -23,10 +23,7 @@
#include <stdio.h>
-#ifdef ZTS
#include "../TSRM/TSRM.h"
-#endif
-
#include "zend_globals_macros.h"
#define MEM_BLOCK_START_MAGIC 0x7312F8DCL
@@ -117,7 +114,7 @@ ZEND_API int _persist_alloc(void *ptr ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC);
ZEND_API int zend_set_memory_limit(unsigned int memory_limit);
-ZEND_API void start_memory_manager(ALS_D);
+ZEND_API void start_memory_manager(TSRMLS_D);
ZEND_API void shutdown_memory_manager(int silent, int clean_cache);
#if ZEND_DEBUG