cvs: ZendEngine2 / zend_execute.h zend_execute_API.c

pollita Wed Nov 8 10:09:17 2006 UTC Modified files: /ZendEngine2 zend_execute_API.c zend_execute.h Log: Put zend_lookup_class_ex back into the API for BC. http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_execute_API.c?r1=1.386&r2=1.387&diff_format=u Index: ZendEngine2/zend_execute_API.c diff -u ZendEngine2/zend_execute_API.c:1.386 ZendEngine2/zend_execute_API.c:1.387 --- ZendEngine2/zend_execute_API.c:1.386 Wed Oct 18 17:03:26 2006 +++ ZendEngine2/zend_execute_API.c Wed Nov 8 10:09:17 2006 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_execute_API.c,v 1.386 2006/10/18 17:03:26 johannes Exp $ */ +/* $Id: zend_execute_API.c,v 1.387 2006/11/08 10:09:17 pollita Exp $ */ #include <stdio.h> #include <signal.h> @@ -1200,6 +1200,11 @@ return zend_u_lookup_class_ex(type, name, name_length, 1, 1, ce TSRMLS_CC); } +ZEND_API int zend_lookup_class_ex(char *name, int name_length, int use_autoload, zend_class_entry ***ce TSRMLS_DC) +{ + return zend_u_lookup_class_ex(IS_STRING, ZSTR(name), name_length, use_autoload, 1, ce TSRMLS_CC); +} + ZEND_API int zend_lookup_class(char *name, int name_length, zend_class_entry ***ce TSRMLS_DC) { return zend_u_lookup_class(IS_STRING, ZSTR(name), name_length, ce TSRMLS_CC); http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_execute.h?r1=1.103&r2=1.104&diff_format=u Index: ZendEngine2/zend_execute.h diff -u ZendEngine2/zend_execute.h:1.103 ZendEngine2/zend_execute.h:1.104 --- ZendEngine2/zend_execute.h:1.103 Wed Oct 18 16:34:25 2006 +++ ZendEngine2/zend_execute.h Wed Nov 8 10:09:17 2006 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_execute.h,v 1.103 2006/10/18 16:34:25 johannes Exp $ */ +/* $Id: zend_execute.h,v 1.104 2006/11/08 10:09:17 pollita Exp $ */ #ifndef ZEND_EXECUTE_H #define ZEND_EXECUTE_H @@ -70,6 +70,7 @@ } } ZEND_API int zend_lookup_class(char *name, int name_length, zend_class_entry ***ce TSRMLS_DC); +ZEND_API int zend_lookup_class_ex(char *name, int name_length, int use_autoload, zend_class_entry ***ce TSRMLS_DC); ZEND_API int zend_u_lookup_class(zend_uchar type, zstr name, int name_length, zend_class_entry ***ce TSRMLS_DC); ZEND_API int zend_u_lookup_class_ex(zend_uchar type, zstr name, int name_length, int use_autoload, int do_normalize, zend_class_entry ***ce TSRMLS_DC); ZEND_API int zend_eval_string(char *str, zval *retval_ptr, char *string_name TSRMLS_DC);