cvs: pecl /bcompiler bcompiler.c

val Wed Dec 20 22:51:15 2006 UTC Modified files: /pecl/bcompiler bcompiler.c Log: fix class inheritance problems http://cvs.php.net/viewvc.cgi/pecl/bcompiler/bcompiler.c?r1=1.108&r2=1.109&diff_format=u Index: pecl/bcompiler/bcompiler.c diff -u pecl/bcompiler/bcompiler.c:1.108 pecl/bcompiler/bcompiler.c:1.109 --- pecl/bcompiler/bcompiler.c:1.108 Sun Dec 17 10:52:29 2006 +++ pecl/bcompiler/bcompiler.c Wed Dec 20 22:51:15 2006 @@ -20,7 +20,7 @@ | Mike Bretz <mike@metropolis-ag.de> | +----------------------------------------------------------------------+ */ -/* $Id: bcompiler.c,v 1.108 2006/12/17 10:52:29 val Exp $ */ +/* $Id: bcompiler.c,v 1.109 2006/12/20 22:51:15 val Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -57,7 +57,7 @@ /* Define the header & version */ -#define BCOMPILER_VERSION "0.8" +#define BCOMPILER_VERSION "0.9" #define BCOMPILER_STREAMS "s" #define BCOMPILER_UNICODE "u" #ifndef PHP_HAVE_STREAMS @@ -1339,7 +1339,7 @@ php_stream_close(stream); return; } -#endif DISABLED_EXE +#endif // now read the length pos = pos - 4; BCOMPILER_DEBUG(("move to start: %d\n", pos)); @@ -2943,7 +2943,7 @@ apc_create_string2(&parent_name, -1 TSRMLS_CC); BCOMPILER_DEBUG(("PARENT %s\n",parent_name)); #if PHP_MAJOR_VERSION >= 6 - if (zend_lookup_class(parent_name, BCOMPILERG(is_unicode) ? u_strlen((UChar*)parent_name) : strlen(parent_name), &pce TSRMLS_CC) == FAILURE) + if (zend_u_lookup_class(BCOMPILERG(is_unicode) ? IS_UNICODE : IS_STRING, ZSTR(parent_name), BCOMPILERG(is_unicode) ? u_strlen((UChar*)parent_name) : strlen(parent_name), &pce TSRMLS_CC) == FAILURE) #elif defined(ZEND_ENGINE_2) if (zend_lookup_class(parent_name, strlen(parent_name), &pce TSRMLS_CC) == FAILURE) #else @@ -3109,10 +3109,11 @@ Since we now can do inheritance by striping - this is usefull.. */ - +#if 0 /* val: all PHP versions work fine without it */ if (zce->parent) { bcompiler_inherit(zce TSRMLS_CC); } +#endif if (parent_name) { apclib_free_string(&parent_name); }