sniper Mon Dec 5 21:00:15 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src/ext/spl php_spl.c spl_functions.c spl_functions.h
spl_iterators.c
Log:
MFH
http://cvs.php.net/diff.php/php-src/ext/spl/php_spl.c?r1=1.52.2.16&r2=1.52.2.17&ty=u
Index: php-src/ext/spl/php_spl.c
diff -u php-src/ext/spl/php_spl.c:1.52.2.16 php-src/ext/spl/php_spl.c:1.52.2.17
--- php-src/ext/spl/php_spl.c:1.52.2.16 Mon Nov 28 22:33:57 2005
+++ php-src/ext/spl/php_spl.c Mon Dec 5 21:00:14 2005
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_spl.c,v 1.52.2.16 2005/11/29 03:33:57 helly Exp $ */
+/* $Id: php_spl.c,v 1.52.2.17 2005/12/06 02:00:14 sniper Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -45,7 +45,7 @@
/* {{{ spl_functions_none
*/
-function_entry spl_functions_none[] = {
+zend_function_entry spl_functions_none[] = {
{NULL, NULL, NULL}
};
/* }}} */
@@ -599,7 +599,7 @@
/* {{{ spl_functions
*/
-function_entry spl_functions[] = {
+zend_function_entry spl_functions[] = {
PHP_FE(spl_classes, NULL)
PHP_FE(spl_autoload, NULL)
PHP_FE(spl_autoload_extensions, NULL)
http://cvs.php.net/diff.php/php-src/ext/spl/spl_functions.c?r1=1.28&r2=1.28.2.1&ty=u
Index: php-src/ext/spl/spl_functions.c
diff -u php-src/ext/spl/spl_functions.c:1.28
php-src/ext/spl/spl_functions.c:1.28.2.1
--- php-src/ext/spl/spl_functions.c:1.28 Wed Aug 3 10:07:53 2005
+++ php-src/ext/spl/spl_functions.c Mon Dec 5 21:00:14 2005
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: spl_functions.c,v 1.28 2005/08/03 14:07:53 sniper Exp $ */
+/* $Id: spl_functions.c,v 1.28.2.1 2005/12/06 02:00:14 sniper Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -50,7 +50,7 @@
/* }}} */
/* {{{ spl_register_std_class */
-void spl_register_std_class(zend_class_entry ** ppce, char * class_name, void
* obj_ctor, function_entry * function_list TSRMLS_DC)
+void spl_register_std_class(zend_class_entry ** ppce, char * class_name, void
* obj_ctor, zend_function_entry * function_list TSRMLS_DC)
{
zend_class_entry ce;
@@ -66,7 +66,7 @@
/* }}} */
/* {{{ spl_register_sub_class */
-void spl_register_sub_class(zend_class_entry ** ppce, zend_class_entry *
parent_ce, char * class_name, void *obj_ctor, function_entry * function_list
TSRMLS_DC)
+void spl_register_sub_class(zend_class_entry ** ppce, zend_class_entry *
parent_ce, char * class_name, void *obj_ctor, zend_function_entry *
function_list TSRMLS_DC)
{
zend_class_entry ce;
@@ -91,7 +91,7 @@
/* }}} */
/* {{{ spl_register_functions */
-void spl_register_functions(zend_class_entry * class_entry, function_entry *
function_list TSRMLS_DC)
+void spl_register_functions(zend_class_entry * class_entry,
zend_function_entry * function_list TSRMLS_DC)
{
zend_register_functions(class_entry, function_list,
&class_entry->function_table, MODULE_PERSISTENT TSRMLS_CC);
}
http://cvs.php.net/diff.php/php-src/ext/spl/spl_functions.h?r1=1.19.2.1&r2=1.19.2.2&ty=u
Index: php-src/ext/spl/spl_functions.h
diff -u php-src/ext/spl/spl_functions.h:1.19.2.1
php-src/ext/spl/spl_functions.h:1.19.2.2
--- php-src/ext/spl/spl_functions.h:1.19.2.1 Wed Sep 14 23:33:04 2005
+++ php-src/ext/spl/spl_functions.h Mon Dec 5 21:00:14 2005
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: spl_functions.h,v 1.19.2.1 2005/09/15 03:33:04 helly Exp $ */
+/* $Id: spl_functions.h,v 1.19.2.2 2005/12/06 02:00:14 sniper Exp $ */
#ifndef PHP_FUNCTIONS_H
#define PHP_FUNCTIONS_H
@@ -57,13 +57,13 @@
void spl_destroy_class(zend_class_entry ** ppce);
-void spl_register_std_class(zend_class_entry ** ppce, char * class_name,
create_object_func_t ctor, function_entry * function_list TSRMLS_DC);
-void spl_register_sub_class(zend_class_entry ** ppce, zend_class_entry *
parent_ce, char * class_name, create_object_func_t ctor, function_entry *
function_list TSRMLS_DC);
+void spl_register_std_class(zend_class_entry ** ppce, char * class_name,
create_object_func_t ctor, zend_function_entry * function_list TSRMLS_DC);
+void spl_register_sub_class(zend_class_entry ** ppce, zend_class_entry *
parent_ce, char * class_name, create_object_func_t ctor, zend_function_entry *
function_list TSRMLS_DC);
void spl_register_interface(zend_class_entry ** ppce, char * class_name,
zend_function_entry *functions TSRMLS_DC);
void spl_register_parent_ce(zend_class_entry * class_entry, zend_class_entry *
parent_class TSRMLS_DC);
-void spl_register_functions(zend_class_entry * class_entry, function_entry *
function_list TSRMLS_DC);
+void spl_register_functions(zend_class_entry * class_entry,
zend_function_entry * function_list TSRMLS_DC);
void spl_register_property( zend_class_entry * class_entry, char *prop_name,
zval *prop_val, int prop_flags TSRMLS_DC);
/* sub: whether to allow subclasses/interfaces
http://cvs.php.net/diff.php/php-src/ext/spl/spl_iterators.c?r1=1.73.2.7&r2=1.73.2.8&ty=u
Index: php-src/ext/spl/spl_iterators.c
diff -u php-src/ext/spl/spl_iterators.c:1.73.2.7
php-src/ext/spl/spl_iterators.c:1.73.2.8
--- php-src/ext/spl/spl_iterators.c:1.73.2.7 Mon Dec 5 14:54:47 2005
+++ php-src/ext/spl/spl_iterators.c Mon Dec 5 21:00:14 2005
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: spl_iterators.c,v 1.73.2.7 2005/12/05 19:54:47 stas Exp $ */
+/* $Id: spl_iterators.c,v 1.73.2.8 2005/12/06 02:00:14 sniper Exp $ */
#ifdef HAVE_CONFIG_H
# include "config.h"
@@ -54,7 +54,7 @@
PHPAPI zend_class_entry *spl_ce_EmptyIterator;
PHPAPI zend_class_entry *spl_ce_AppendIterator;
-function_entry spl_funcs_RecursiveIterator[] = {
+zend_function_entry spl_funcs_RecursiveIterator[] = {
SPL_ABSTRACT_ME(RecursiveIterator, hasChildren, NULL)
SPL_ABSTRACT_ME(RecursiveIterator, getChildren, NULL)
{NULL, NULL, NULL}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
