cvs: ZendEngine2 / zend_execute.h php4/ext/standard var_unserializer.c

sebastian Mon Jun 2 11:53:09 2003 EDT Modified files: /php4/ext/standard var_unserializer.c /ZendEngine2 zend_execute.h Log: Leftover. Index: php4/ext/standard/var_unserializer.c diff -u php4/ext/standard/var_unserializer.c:1.23 php4/ext/standard/var_unserializer.c:1.24 --- php4/ext/standard/var_unserializer.c:1.23 Sat May 24 13:12:58 2003 +++ php4/ext/standard/var_unserializer.c Mon Jun 2 11:53:09 2003 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: var_unserializer.c,v 1.23 2003/05/24 17:12:58 helly Exp $ */ +/* $Id: var_unserializer.c,v 1.24 2003/06/02 15:53:09 sebastian Exp $ */ #include "php.h" #include "ext/standard/php_var.h" @@ -429,7 +429,7 @@ do { /* Try to find class directly */ - if (zend_lookup_ns_class(class_name, len2, &pce TSRMLS_CC) == SUCCESS) { + if (zend_lookup_class(class_name, len2, &pce TSRMLS_CC) == SUCCESS) { ce = *pce; break; } @@ -460,7 +460,7 @@ } /* The callback function may have defined the class */ - if (zend_lookup_ns_class(class_name, len2, &pce TSRMLS_CC) == SUCCESS) { + if (zend_lookup_class(class_name, len2, &pce TSRMLS_CC) == SUCCESS) { ce = *pce; } else { php_error_docref(NULL TSRMLS_CC, E_WARNING, "Function %s() hasn't defined the class it was called for", user_func->value.str.val); Index: ZendEngine2/zend_execute.h diff -u ZendEngine2/zend_execute.h:1.54 ZendEngine2/zend_execute.h:1.55 --- ZendEngine2/zend_execute.h:1.54 Mon Jun 2 08:13:11 2003 +++ ZendEngine2/zend_execute.h Mon Jun 2 11:53:09 2003 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_execute.h,v 1.54 2003/06/02 12:13:11 stas Exp $ */ +/* $Id: zend_execute.h,v 1.55 2003/06/02 15:53:09 sebastian Exp $ */ #ifndef ZEND_EXECUTE_H #define ZEND_EXECUTE_H @@ -68,7 +68,6 @@ } } ZEND_API int zend_lookup_class(char *name, int name_length, zend_class_entry ***ce TSRMLS_DC); -ZEND_API int zend_lookup_ns_class(char *name, int name_length, zend_class_entry ***ce TSRMLS_DC); ZEND_API int zend_eval_string(char *str, zval *retval_ptr, char *string_name TSRMLS_DC); static inline int i_zend_is_true(zval *op)