diff options
| author | Dmitry Stogov <dmitry@php.net> | 2009-09-03 14:33:11 +0000 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@php.net> | 2009-09-03 14:33:11 +0000 |
| commit | 4016bfcd719171b128f20196a2a6eda8b3d8dd0e (patch) | |
| tree | 56a1aacab463827b4dcfdf87241943633db6f890 /Zend/zend_alloc.c | |
| parent | 853c6de65bbd83000fdb1cf59fb164a3516861cd (diff) | |
| download | php-git-4016bfcd719171b128f20196a2a6eda8b3d8dd0e.tar.gz | |
Fixed bug #46074 (Bus error during running PHP CLI under IRIX 6.5.30)
Diffstat (limited to 'Zend/zend_alloc.c')
| -rw-r--r-- | Zend/zend_alloc.c | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/Zend/zend_alloc.c b/Zend/zend_alloc.c index a6abbba650..6e94e81da6 100644 --- a/Zend/zend_alloc.c +++ b/Zend/zend_alloc.c @@ -512,20 +512,7 @@ static unsigned int _zend_mm_cookie = 0; /* optimized access */ #define ZEND_MM_FREE_BLOCK_SIZE(b) (b)->info._size -#ifndef ZEND_MM_ALIGNMENT -# define ZEND_MM_ALIGNMENT 8 -# define ZEND_MM_ALIGNMENT_LOG2 3 -#elif ZEND_MM_ALIGNMENT < 4 -# undef ZEND_MM_ALIGNMENT -# undef ZEND_MM_ALIGNMENT_LOG2 -# define ZEND_MM_ALIGNMENT 4 -# define ZEND_MM_ALIGNMENT_LOG2 2 -#endif - -#define ZEND_MM_ALIGNMENT_MASK ~(ZEND_MM_ALIGNMENT-1) - /* Aligned header size */ -#define ZEND_MM_ALIGNED_SIZE(size) ((size + ZEND_MM_ALIGNMENT - 1) & ZEND_MM_ALIGNMENT_MASK) #define ZEND_MM_ALIGNED_HEADER_SIZE ZEND_MM_ALIGNED_SIZE(sizeof(zend_mm_block)) #define ZEND_MM_ALIGNED_FREE_HEADER_SIZE ZEND_MM_ALIGNED_SIZE(sizeof(zend_mm_small_free_block)) #define ZEND_MM_MIN_ALLOC_BLOCK_SIZE ZEND_MM_ALIGNED_SIZE(ZEND_MM_ALIGNED_HEADER_SIZE + END_MAGIC_SIZE) |