Merge branch 'refactoring2' of github.com:zend-dev/php into refactoring2

This commit is contained in:
Dmitry Stogov 2014-02-14 13:40:23 +04:00
commit c56a2344d0
2 changed files with 241 additions and 272 deletions

View file

@ -717,7 +717,8 @@ END_EXTERN_C()
}
#define HASH_OF(p) (Z_TYPE_P(p)==IS_ARRAY ? Z_ARRVAL_P(p) : ((Z_TYPE_P(p)==IS_OBJECT ? Z_OBJ_HT_P(p)->get_properties((p) TSRMLS_CC) : NULL)))
#define ZVAL_IS_NULL(z) (Z_TYPE_P(z)==IS_NULL)
#define ZVAL_IS_NULL(z) (Z_TYPE_P(z) == IS_NULL)
#define ZVAL_IS_UNDEF(z) (Z_TYPE_P(z) == IS_UNDEF)
/* For compatibility */
#define ZEND_MINIT ZEND_MODULE_STARTUP_N

File diff suppressed because it is too large Load diff