Merge branch 'PHP-7.1' into PHP-7.2

sgolemon · sgolemon · commit 361d3007a681 · 2017-09-07T17:36:35.000-04:00
* PHP-7.1:
  Add BC define for users of the typoed zend_symbtable_add_new
diff --git a/Zend/zend_hash.h b/Zend/zend_hash.h
@@ -357,6 +357,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
`@@ -357,6 +357,10 @@ static zend_always_inline zval zend_symtable_add_new(HashTable ht, zend_string`
`357`	`357`	`}`
`358`	`358`	`}`
`359`	`359`
	`360`	`+/* This typo snuck into 7.0.17 and 7.1.3, this define exists for BC */`
	`361`	`+#define zend_symbtable_add_new(ht, key, pData) \`
	`362`	`+ zend_symtable_add_new(ht, key, pData)`
	`363`	`+`
`360`	`364`	`static zend_always_inline zval zend_symtable_update(HashTable ht, zend_string key, zval pData)`
`361`	`365`	`{`
`362`	`366`	`zend_ulong idx;`