diff options
| author | Dmitry Stogov <dmitry@php.net> | 2007-01-09 15:29:14 +0000 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@php.net> | 2007-01-09 15:29:14 +0000 |
| commit | 38f942b88013b203129825329e84581d0ae330b3 (patch) | |
| tree | 09f0dcb515aea4f517444f55f7fc6a4f1fbc0c09 /Zend/zend_alloc.c | |
| parent | 96a8399e2fe0a95627320e8d47a208591e0bdeaf (diff) | |
| download | php-git-38f942b88013b203129825329e84581d0ae330b3.tar.gz | |
Fixed bug #40076 (zend_alloc.c: Value of enumeration constant must be in range of signed integer)
Diffstat (limited to 'Zend/zend_alloc.c')
| -rw-r--r-- | Zend/zend_alloc.c | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/Zend/zend_alloc.c b/Zend/zend_alloc.c index c547d47e4b..c097f3b1cd 100644 --- a/Zend/zend_alloc.c +++ b/Zend/zend_alloc.c @@ -292,13 +292,11 @@ static const zend_mm_mem_handlers mem_handlers[] = { /* Heap Manager */ /****************/ -typedef enum _mem_magic { - MEM_BLOCK_VALID = 0x7312F8DC, - MEM_BLOCK_FREED = 0x99954317, - MEM_BLOCK_CACHED = 0xFB8277DC, - MEM_BLOCK_GUARD = 0x2A8FCC84, - MEM_BLOCK_LEAK = 0x6C5E8F2D -} mem_magic; +#define MEM_BLOCK_VALID 0x7312F8DC +#define MEM_BLOCK_FREED 0x99954317 +#define MEM_BLOCK_CACHED 0xFB8277DC +#define MEM_BLOCK_GUARD 0x2A8FCC84 +#define MEM_BLOCK_LEAK 0x6C5E8F2D /* mm block type */ typedef struct _zend_mm_block_info { @@ -334,7 +332,7 @@ typedef struct _zend_mm_debug_info { typedef struct _zend_mm_block { zend_mm_block_info info; #if ZEND_DEBUG - mem_magic magic; + unsigned int magic; # ifdef ZTS THREAD_T thread_id; # endif @@ -347,7 +345,7 @@ typedef struct _zend_mm_block { typedef struct _zend_mm_free_block { zend_mm_block_info info; #if ZEND_DEBUG - mem_magic magic; + unsigned int magic; # ifdef ZTS THREAD_T thread_id; # endif |