com php-src: Fix #76820: Z_COPYABLE invalid definition: NEWS Zend/zend_types.h
| From: | Christoph Michael Becker | Date: | Thu, 30 Aug 2018 16:00:51 +0000 |
| Subject: | com php-src: Fix #76820: Z_COPYABLE invalid definition: NEWS Zend/zend_types.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-102945@lists.php.net to get a copy of this message | ||
Commit: c5231ad394fa3a6c59b9786af977d61da3f1e208
Author: Christoph M. Becker <cmbecker69@gmx.de> Thu, 30 Aug 2018 18:00:51 +0200
Parents: 09ea23f7d6189fbf69f7c172004481017fa7be8f
Branches: PHP-7.3 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=c5231ad394fa3a6c59b9786af977d61da3f1e208
Log:
Fix #76820: Z_COPYABLE invalid definition
We remove the extraneous parenthesis.
Bugs:
https://bugs.php.net/76820
Changed paths:
M NEWS
M Zend/zend_types.h
Diff:
diff --git a/NEWS b/NEWS
index c06a3d8..97b44fb 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,9 @@ PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
?? ??? ????, PHP 7.3.0RC1
+- Core:
+ . Fixed bug #76820 (Z_COPYABLE invalid definition). (mvdwerve, cmb)
+
- Standard:
. Fixed bug #76803 (ftruncate changes file pointer). (Anatol)
. Fixed bug #76818 (Memory corruption and segfault). (Remi)
diff --git a/Zend/zend_types.h b/Zend/zend_types.h
index 7202ad9..64f8dee 100644
--- a/Zend/zend_types.h
+++ b/Zend/zend_types.h
@@ -590,7 +590,7 @@ static zend_always_inline uint32_t zval_gc_info(uint32_t gc_type_info) {
#define Z_REFCOUNTED_P(zval_p) Z_REFCOUNTED(*(zval_p))
/* deprecated: (COPYABLE is the same as IS_ARRAY) */
-#define Z_COPYABLE(zval) ((Z_TYPE(zval) == IS_ARRAY)
+#define Z_COPYABLE(zval) (Z_TYPE(zval) == IS_ARRAY)
#define Z_COPYABLE_P(zval_p) Z_COPYABLE(*(zval_p))
/* deprecated: (IMMUTABLE is the same as IS_ARRAY && !REFCOUNTED) */
@@ -610,7 +610,7 @@ static zend_always_inline uint32_t zval_gc_info(uint32_t gc_type_info) {
#define Z_OPT_REFCOUNTED_P(zval_p) Z_OPT_REFCOUNTED(*(zval_p))
/* deprecated: (COPYABLE is the same as IS_ARRAY) */
-#define Z_OPT_COPYABLE(zval) ((Z_OPT_TYPE(zval) == IS_ARRAY)
+#define Z_OPT_COPYABLE(zval) (Z_OPT_TYPE(zval) == IS_ARRAY)
#define Z_OPT_COPYABLE_P(zval_p) Z_OPT_COPYABLE(*(zval_p))
#define Z_OPT_ISREF(zval) (Z_OPT_TYPE(zval) == IS_REFERENCE)