helly Thu Jan 11 21:33:23 2007 UTC
Modified files:
/php-src/ext/spl spl_engine.h
Log:
- Unicode support
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/spl_engine.h?r1=1.23&r2=1.24&diff_format=u
Index: php-src/ext/spl/spl_engine.h
diff -u php-src/ext/spl/spl_engine.h:1.23 php-src/ext/spl/spl_engine.h:1.24
--- php-src/ext/spl/spl_engine.h:1.23 Mon Jan 1 09:29:29 2007
+++ php-src/ext/spl/spl_engine.h Thu Jan 11 21:33:23 2007
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: spl_engine.h,v 1.23 2007/01/01 09:29:29 sebastian Exp $ */
+/* $Id: spl_engine.h,v 1.24 2007/01/11 21:33:23 helly Exp $ */
#ifndef SPL_ENGINE_H
#define SPL_ENGINE_H
@@ -24,6 +24,7 @@
#include "php.h"
#include "php_spl.h"
#include "zend_interfaces.h"
+#include "zend_unicode.h"
/* {{{ zend_class_entry */
static inline zend_class_entry *spl_get_class_entry(zval *obj TSRMLS_DC)
@@ -43,8 +44,7 @@
{
spl_instantiate(pce, retval, alloc TSRMLS_CC);
- /* FIXME: Unicode support??? */
- zend_call_method(retval, pce, &pce->constructor,
pce->constructor->common.function_name.s,
strlen(pce->constructor->common.function_name.s), NULL, 1, arg1, NULL
TSRMLS_CC);
+ zend_u_call_method(retval, pce, &pce->constructor, ZEND_STR_TYPE,
pce->constructor->common.function_name,
USTR_LEN(pce->constructor->common.function_name), NULL, 1, arg1, NULL
TSRMLS_CC);
return 0;
}
/* }}} */
@@ -54,8 +54,7 @@
{
spl_instantiate(pce, retval, alloc TSRMLS_CC);
- /* FIXME: Unicode support??? */
- zend_call_method(retval, pce, &pce->constructor,
pce->constructor->common.function_name.s,
strlen(pce->constructor->common.function_name.s), NULL, 2, arg1, arg2
TSRMLS_CC);
+ zend_u_call_method(retval, pce, &pce->constructor, ZEND_STR_TYPE,
pce->constructor->common.function_name,
USTR_LEN(pce->constructor->common.function_name), NULL, 2, arg1, arg2
TSRMLS_CC);
return 0;
}
/* }}} */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
