Merge remote-tracking branch 'php-src/master' into ast

Conflicts:
	Zend/zend_compile.c
	Zend/zend_compile.h
	Zend/zend_globals.h
	Zend/zend_language_parser.y
	Zend/zend_language_scanner.c
	Zend/zend_language_scanner.l
	Zend/zend_types.h

1 files changed, 4 insertions, 4 deletions

diff --git a/Zend/zend_static_allocator.c b/Zend/zend_static_allocator.c
index 71338d211e..049d29f6a2 100644
--- a/Zend/zend_static_allocator.c
+++ b/Zend/zend_static_allocator.c
@@ -22,13 +22,13 @@
 
 /* Not checking emalloc() and erealloc() return values as they are supposed to bailout */
 
-inline static void block_init(Block *block, zend_uint block_size)
+inline static void block_init(Block *block, uint32_t block_size)
 {
 	block->pos = block->bp = (char *) emalloc(block_size);
 	block->end = block->bp + block_size;
 }
 
-inline static char *block_allocate(Block *block, zend_uint size)
+inline static char *block_allocate(Block *block, uint32_t size)
 {
 	char *retval = block->pos;
 	if ((block->pos += size) >= block->end) {
@@ -50,7 +50,7 @@ void static_allocator_init(StaticAllocator *sa)
 	sa->current_block = 0;
 }
 
-char *static_allocator_allocate(StaticAllocator *sa, zend_uint size)
+char *static_allocator_allocate(StaticAllocator *sa, uint32_t size)
 {
 	char *retval;
 
@@ -67,7 +67,7 @@ char *static_allocator_allocate(StaticAllocator *sa, zend_uint size)
 
 void static_allocator_destroy(StaticAllocator *sa)
 {
-	zend_uint i;
+	uint32_t i;
 
 	for (i=0; i<sa->num_blocks; i++) {
 		block_free(&sa->Blocks[i]);