cvs: ZendEngine2(PHP_5_2) / zend_compile.c
| From: | Marcus Boerger | Date: | Tue, 30 May 2006 19:41:04 +0000 |
| Subject: | cvs: ZendEngine2(PHP_5_2) / zend_compile.c | ||
| Groups: | php.zend-engine.cvs | ||
| Request: | Send a blank email to php-zend-engine-cvs+get-4947@lists.php.net to get a copy of this message | ||
helly Tue May 30 19:41:04 2006 UTC
Modified files: (Branch: PHP_5_2)
/ZendEngine2 zend_compile.c
Log:
- MFH WS
http://cvs.php.net/viewcvs.cgi/ZendEngine2/zend_compile.c?r1=1.647.2.27.2.7&r2=1.647.2.27.2.8&diff_format=u
Index: ZendEngine2/zend_compile.c
diff -u ZendEngine2/zend_compile.c:1.647.2.27.2.7 ZendEngine2/zend_compile.c:1.647.2.27.2.8
--- ZendEngine2/zend_compile.c:1.647.2.27.2.7 Mon May 29 21:28:29 2006
+++ ZendEngine2/zend_compile.c Tue May 30 19:41:04 2006
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_compile.c,v 1.647.2.27.2.7 2006/05/29 21:28:29 tony2001 Exp $ */
+/* $Id: zend_compile.c,v 1.647.2.27.2.8 2006/05/30 19:41:04 helly Exp $ */
#include <zend_language_parser.h>
#include "zend.h"
@@ -2033,7 +2033,6 @@
child->common.prototype = parent->common.prototype ? parent->common.prototype : parent;
}
-
if (child->common.prototype) {
if (!zend_do_perform_implementation_check(child, child->common.prototype)) {
zend_error(E_COMPILE_ERROR, "Declaration of %s::%s() must be compatible with that of
%s::%s()", ZEND_FN_SCOPE_NAME(child), child->common.function_name,
ZEND_FN_SCOPE_NAME(child->common.prototype),
child->common.prototype->common.function_name);