Merge branch 'PHP-5.4'

laruence · laruence · commit a027ba3afe8b · 2012-06-26T18:50:52.000+08:00
* PHP-5.4:
  Fixed bug #62357 (compile failure: (S) Arguments missing for built-in function __memcmp).
diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y
@@ -1206,7 +1206,7 @@ static YYSIZE_T zend_yytnamerr(char *yyres, const char *yystr)
 
 			if (LANG_SCNG(yy_text)[0] == 0 &&
 				LANG_SCNG(yy_leng) == 1 &&
-				memcmp(yystr, ZEND_STRL("\"end of file\"")) == 0) {
+				memcmp(yystr, "\"end of file\"", sizeof("\"end of file\"") - 1) == 0) {
 				yystpcpy(yyres, "end of file");
 				return sizeof("end of file")-1;
 			}

Original file line number	Diff line number	Diff line change
`@@ -1206,7 +1206,7 @@ static YYSIZE_T zend_yytnamerr(char yyres, const char yystr)`
`1206`	`1206`
`1207`	`1207`	`if (LANG_SCNG(yy_text)[0] == 0 &&`
`1208`	`1208`	`LANG_SCNG(yy_leng) == 1 &&`
`1209`		`- memcmp(yystr, ZEND_STRL("\"end of file\"")) == 0) {`
	`1209`	`+ memcmp(yystr, "\"end of file\"", sizeof("\"end of file\"") - 1) == 0) {`
`1210`	`1210`	`yystpcpy(yyres, "end of file");`
`1211`	`1211`	`return sizeof("end of file")-1;`
`1212`	`1212`	`}`