From: Xinchen Hui <laruence@php.net>
Date: Tue, 10 Jun 2014 13:58:16 +0000 (+0800)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: PRE_PHPNG_MERGE~208^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ebe6854dbc1c61b303f5adbec712741b1bdcae70;p=php

Merge branch 'PHP-5.5' into PHP-5.6

Conflicts:
	Zend/zend_execute_API.c
---

ebe6854dbc1c61b303f5adbec712741b1bdcae70
diff --cc Zend/zend_execute_API.c
index c9de6b93ca,e100484f6f..af32e91f28
--- a/Zend/zend_execute_API.c
+++ b/Zend/zend_execute_API.c
@@@ -449,9 -448,7 +449,7 @@@ ZEND_API int zend_is_true(zval *op) /* 
  }
  /* }}} */
  
- #include "../TSRM/tsrm_strtok_r.h"
- 
 -#define IS_VISITED_CONSTANT			IS_CONSTANT_INDEX
 +#define IS_VISITED_CONSTANT			0x80
  #define IS_CONSTANT_VISITED(p)		(Z_TYPE_P(p) & IS_VISITED_CONSTANT)
  #define Z_REAL_TYPE_P(p)			(Z_TYPE_P(p) & ~IS_VISITED_CONSTANT)
  #define MARK_CONSTANT_VISITED(p)	Z_TYPE_P(p) |= IS_VISITED_CONSTANT