1 --- php-5.2.11/ext/spl/config.m4~ 2006-12-04 20:01:53.000000000 +0200
2 +++ php-5.2.11/ext/spl/config.m4 2009-09-23 16:07:37.775732678 +0300
5 AC_DEFINE_UNQUOTED(HAVE_PACKED_OBJECT_VALUE, $ac_result, [Whether struct _zend_object_value is packed])
6 AC_DEFINE(HAVE_SPL, 1, [Whether you want SPL (Standard PHP Library) support])
7 - PHP_NEW_EXTENSION(spl, php_spl.c spl_functions.c spl_engine.c spl_iterators.c spl_array.c spl_directory.c spl_sxe.c spl_exceptions.c spl_observer.c, no)
8 + PHP_NEW_EXTENSION(spl, php_spl.c spl_functions.c spl_engine.c spl_iterators.c spl_array.c spl_directory.c spl_sxe.c spl_exceptions.c spl_observer.c, $ext_shared)
9 PHP_INSTALL_HEADERS([ext/spl], [php_spl.h spl_array.h spl_directory.h spl_engine.h spl_exceptions.h spl_functions.h spl_iterators.h spl_observer.h spl_sxe.h])
10 PHP_ADD_EXTENSION_DEP(spl, pcre, true)
12 --- php-5.2.11/ext/spl/spl_iterators.c~ 2009-09-23 17:57:06.000000000 +0300
13 +++ php-5.2.11/ext/spl/spl_iterators.c 2009-09-23 17:57:09.025079005 +0300
15 PHPAPI zend_class_entry *spl_ce_AppendIterator;
16 PHPAPI zend_class_entry *spl_ce_RegexIterator;
17 PHPAPI zend_class_entry *spl_ce_RecursiveRegexIterator;
19 +#undef spl_ce_Countable
20 +zend_class_entry *spl_ce_Countable; // real instance
21 +extern PHPAPI zend_class_entry *spl_ce_Countable_p; // external one
23 PHPAPI zend_class_entry *spl_ce_Countable;
26 zend_function_entry spl_funcs_RecursiveIterator[] = {
27 SPL_ABSTRACT_ME(RecursiveIterator, hasChildren, NULL)
28 @@ -2950,6 +2956,10 @@
29 REGISTER_SPL_STD_CLASS_EX(EmptyIterator, NULL, spl_funcs_EmptyIterator);
30 REGISTER_SPL_ITERATOR(EmptyIterator);
33 + spl_ce_Countable_p = spl_ce_Countable;
39 --- php-5.2.11/ext/spl/spl_iterators.h 2009-09-23 17:57:59.898412166 +0300
40 +++ php-5.2.11/ext/spl/spl_iterators.h 2009-09-23 18:04:45.518458679 +0300
42 extern PHPAPI zend_class_entry *spl_ce_AppendIterator;
43 extern PHPAPI zend_class_entry *spl_ce_RegexIterator;
44 extern PHPAPI zend_class_entry *spl_ce_RecursiveRegexIterator;
46 +#define spl_ce_Countable spl_ce_Countable_p
47 +extern PHPAPI zend_class_entry *spl_ce_Countable_p;
49 extern PHPAPI zend_class_entry *spl_ce_Countable;
52 PHP_MINIT_FUNCTION(spl_iterators);
54 --- php-5.2.11/ext/standard/array.c~ 2009-08-14 09:18:47.000000000 +0300
55 +++ php-5.2.11/ext/standard/array.c 2009-09-24 16:40:24.630430291 +0300
57 #include "php_smart_str.h"
59 #include "ext/spl/spl_array.h"
61 +PHPAPI zend_class_entry *spl_ce_Countable_p = NULL; // external one
66 --- php-5.2.11/ext/pdo/pdo.c~ 2009-07-20 01:46:03.000000000 +0300
67 +++ php-5.2.11/ext/pdo/pdo.c 2009-10-14 13:33:30.397508159 +0300
69 /* {{{ pdo_functions[] */
70 #if ZEND_MODULE_API_NO >= 20050922
71 static zend_module_dep pdo_deps[] = {
73 +#ifdef HAVE_SPL && !COMPILE_DL_SPL
74 ZEND_MOD_REQUIRED("spl")