Merge branch 'PHP-7.0' into PHP-7.1

sgolemon · sgolemon · commit a1573d5620ca · 2017-09-07T17:36:04.000-04:00
* PHP-7.0:
  Add BC define for users of the typoed zend_symbtable_add_new
diff --git a/Zend/zend_hash.h b/Zend/zend_hash.h
@@ -348,6 +348,10 @@ static zend_always_inline zval *zend_symtable_add_new(HashTable *ht, zend_string
 	}
 }
 
+/* This typo snuck into 7.0.17 and 7.1.3, this define exists for BC */
+#define zend_symbtable_add_new(ht, key, pData) \
+        zend_symtable_add_new(ht, key, pData)
+
 static zend_always_inline zval *zend_symtable_update(HashTable *ht, zend_string *key, zval *pData)
 {
 	zend_ulong idx;

Original file line number	Diff line number	Diff line change
`@@ -348,6 +348,10 @@ static zend_always_inline zval zend_symtable_add_new(HashTable ht, zend_string`
`348`	`348`	`}`
`349`	`349`	`}`
`350`	`350`
	`351`	`+/* This typo snuck into 7.0.17 and 7.1.3, this define exists for BC */`
	`352`	`+#define zend_symbtable_add_new(ht, key, pData) \`
	`353`	`+ zend_symtable_add_new(ht, key, pData)`
	`354`	`+`
`351`	`355`	`static zend_always_inline zval zend_symtable_update(HashTable ht, zend_string key, zval pData)`
`352`	`356`	`{`
`353`	`357`	`zend_ulong idx;`