dmitry Tue Jan 9 15:29:29 2007 UTC
Modified files:
/ZendEngine2 zend_alloc.c
Log:
Fixed bug #40076 (zend_alloc.c: Value of enumeration constant must be in
range of signed integer)
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_alloc.c?r1=1.188&r2=1.189&diff_format=u
Index: ZendEngine2/zend_alloc.c
diff -u ZendEngine2/zend_alloc.c:1.188 ZendEngine2/zend_alloc.c:1.189
--- ZendEngine2/zend_alloc.c:1.188 Sun Jan 7 05:45:07 2007
+++ ZendEngine2/zend_alloc.c Tue Jan 9 15:29:29 2007
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_alloc.c,v 1.188 2007/01/07 05:45:07 pollita Exp $ */
+/* $Id: zend_alloc.c,v 1.189 2007/01/09 15:29:29 dmitry Exp $ */
#include "zend.h"
#include "zend_alloc.h"
@@ -292,13 +292,11 @@
/* 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_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_free_block {
zend_mm_block_info info;
#if ZEND_DEBUG
- mem_magic magic;
+ unsigned int magic;
# ifdef ZTS
THREAD_T thread_id;
# endif
--
Zend Engine CVS Mailing List (http://cvs.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
|
