diff options
| author | Xinchen Hui <laruence@php.net> | 2012-06-26 18:50:52 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2012-06-26 18:50:52 +0800 |
| commit | a027ba3afe8b6f5144f928f510d9af8ffe10a532 (patch) | |
| tree | fbc6ac386f698d48be8b555f36587737c82cb0f9 | |
| parent | 02d8e8959b855e72b4d5cafc71666a1bbe3de672 (diff) | |
| parent | a44a1dc194e60c51a4b7716f78f34a7dc334744b (diff) | |
| download | php-git-a027ba3afe8b6f5144f928f510d9af8ffe10a532.tar.gz | |
Merge branch 'PHP-5.4'
* PHP-5.4:
Fixed bug #62357 (compile failure: (S) Arguments missing for built-in function __memcmp).
| -rw-r--r-- | Zend/zend_language_parser.y | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y index 5a5bb60cfb..e397fe138b 100644 --- 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; } |