summaryrefslogtreecommitdiff
path: root/Zend/zend_alloc.c
diff options
context:
space:
mode:
authorDmitry Stogov <dmitry@php.net>2011-09-13 13:29:35 +0000
committerDmitry Stogov <dmitry@php.net>2011-09-13 13:29:35 +0000
commit4a25a7740d62c9ec0318001c3f6d6b3ae01d96ad (patch)
tree3e5041ac2a54ff635c9e77d97e2a14a2f1c860c6 /Zend/zend_alloc.c
parent3a3c2942d254be88b82fc871ef4fa9698e921ac7 (diff)
downloadphp-git-4a25a7740d62c9ec0318001c3f6d6b3ae01d96ad.tar.gz
Fixed ZE specific compile warnings (Bug #55629)
Diffstat (limited to 'Zend/zend_alloc.c')
-rw-r--r--Zend/zend_alloc.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/Zend/zend_alloc.c b/Zend/zend_alloc.c
index bd2f2bb73d..c812a62ba8 100644
--- a/Zend/zend_alloc.c
+++ b/Zend/zend_alloc.c
@@ -344,9 +344,9 @@ typedef struct _zend_mm_block_info {
#if ZEND_DEBUG
typedef struct _zend_mm_debug_info {
- char *filename;
+ const char *filename;
uint lineno;
- char *orig_filename;
+ const char *orig_filename;
uint orig_lineno;
size_t size;
#if ZEND_MM_HEAP_PROTECTION
@@ -460,7 +460,7 @@ struct _zend_mm_heap {
sizeof(zend_mm_free_block*) * 2 - \
sizeof(zend_mm_small_free_block))
-#define ZEND_MM_REST_BLOCK ((zend_mm_free_block*)(zend_uintptr_t)(1))
+#define ZEND_MM_REST_BLOCK ((zend_mm_free_block**)(zend_uintptr_t)(1))
#define ZEND_MM_MAX_REST_BLOCKS 16
@@ -1750,7 +1750,7 @@ static void zend_mm_safe_error(zend_mm_heap *heap,
heap->reserve = NULL;
}
if (heap->overflow == 0) {
- char *error_filename;
+ const char *error_filename;
uint error_lineno;
TSRMLS_FETCH();
if (zend_is_compiling(TSRMLS_C)) {