-+#if COMPILE_DL_SPL
-+ spl_ce_Countable_p = spl_ce_Countable;
-+#endif
-+
- REGISTER_SPL_SUB_CLASS_EX(RecursiveTreeIterator, RecursiveIteratorIterator, spl_RecursiveTreeIterator_new, spl_funcs_RecursiveTreeIterator);
- REGISTER_SPL_CLASS_CONST_LONG(RecursiveTreeIterator, "BYPASS_CURRENT", RTIT_BYPASS_CURRENT);
- REGISTER_SPL_CLASS_CONST_LONG(RecursiveTreeIterator, "BYPASS_KEY", RTIT_BYPASS_KEY);
---- php-5.4.0alpha3/ext/spl/spl_iterators.h~ 2011-07-27 11:48:08.000000000 +0300
-+++ php-5.4.0alpha3/ext/spl/spl_iterators.h 2011-08-08 00:12:10.892993117 +0300
-@@ -51,7 +51,12 @@
- extern PHPAPI zend_class_entry *spl_ce_AppendIterator;
- extern PHPAPI zend_class_entry *spl_ce_RegexIterator;
- extern PHPAPI zend_class_entry *spl_ce_RecursiveRegexIterator;
-+#if COMPILE_DL_SPL
-+#define spl_ce_Countable spl_ce_Countable_p
-+extern PHPAPI zend_class_entry *spl_ce_Countable_p;
-+#else
- extern PHPAPI zend_class_entry *spl_ce_Countable;
-+#endif
- extern PHPAPI zend_class_entry *spl_ce_CallbackFilterIterator;
- extern PHPAPI zend_class_entry *spl_ce_RecursiveCallbackFilterIterator;
-
---- php-5.3.1/ext/standard/array.c~ 2009-08-14 06:20:21.000000000 +0000
-+++ php-5.3.1/ext/standard/array.c 2009-11-27 16:37:15.029078323 +0000
-@@ -49,6 +49,9 @@
- #ifdef HAVE_SPL
- #include "ext/spl/spl_array.h"
- #endif
-+#if COMPILE_DL_SPL
-+PHPAPI zend_class_entry *spl_ce_Countable_p = NULL; // external one
-+#endif
-
- /* {{{ defines */
- #define EXTR_OVERWRITE 0
---- php-5.3.1/ext/pdo/pdo.c~ 2009-07-19 22:46:03.000000000 +0000
-+++ php-5.3.1/ext/pdo/pdo.c 2009-11-27 16:37:51.332409104 +0000
-@@ -132,7 +132,7 @@