cvs: ZendEngine2 / zend_compile.c

dmitry Wed Aug 22 06:17:13 2007 UTC Modified files: /ZendEngine2 zend_compile.c Log: typo http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_compile.c?r1=1.762&r2=1.763&diff_format=u Index: ZendEngine2/zend_compile.c diff -u ZendEngine2/zend_compile.c:1.762 ZendEngine2/zend_compile.c:1.763 --- ZendEngine2/zend_compile.c:1.762 Mon Aug 20 09:48:41 2007 +++ ZendEngine2/zend_compile.c Wed Aug 22 06:17:12 2007 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_compile.c,v 1.762 2007/08/20 09:48:41 dmitry Exp $ */ +/* $Id: zend_compile.c,v 1.763 2007/08/22 06:17:12 dmitry Exp $ */ #include <zend_language_parser.h> #include "zend.h" @@ -3192,7 +3192,7 @@ /* Class name must not conflict with import names */ if (CG(current_import) && zend_u_hash_exists(CG(current_import), Z_TYPE(class_name->u.constant), lcname, lcname_len+1)) { - zend_error(E_COMPILE_ERROR, "Class name '%R' coflicts with import name", Z_TYPE(class_name->u.constant), Z_UNIVAL(class_name->u.constant)); + zend_error(E_COMPILE_ERROR, "Class name '%R' conflicts with import name", Z_TYPE(class_name->u.constant), Z_UNIVAL(class_name->u.constant)); } if (CG(current_namespace)) { @@ -5042,7 +5042,7 @@ } if (zend_u_hash_exists(CG(class_table), Z_TYPE_P(name), lcname, lcname_len+1)) { - zend_error(E_COMPILE_ERROR, "Import name '%R' coflicts with defined class", Z_TYPE_P(name), Z_UNIVAL_P(name)); + zend_error(E_COMPILE_ERROR, "Import name '%R' conflicts with defined class", Z_TYPE_P(name), Z_UNIVAL_P(name)); } if (zend_u_hash_add(CG(current_import), Z_TYPE_P(name), lcname, lcname_len+1, &ns, sizeof(zval*), NULL) != SUCCESS) {