X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=spl-shared.patch;h=9aea6c46db7b46f854c1872da857ee25a7af6446;hb=refs%2Fheads%2FPHP_7_0;hp=0e326fdbed312b9d9e4a241e4d60ecbabd8bd6fb;hpb=aef9a98d7828aeb48703ab2429a6968173d1addf;p=packages%2Fphp.git

diff --git a/spl-shared.patch b/spl-shared.patch
index 0e326fd..9aea6c4 100644
--- a/spl-shared.patch
+++ b/spl-shared.patch
@@ -1,11 +1,11 @@
---- php-5.3.1/ext/spl/config.m4~	2009-11-26 23:54:34.000000000 +0000
-+++ php-5.3.1/ext/spl/config.m4	2009-11-27 08:04:05.788823797 +0000
+--- php-7.0/ext/spl/config.m4~	2015-05-21 17:57:06.000000000 +0300
++++ php-7.0/ext/spl/config.m4	2015-05-23 11:25:19.609715006 +0300
 @@ -22,6 +22,6 @@
    CPPFLAGS=$old_CPPFLAGS
    AC_DEFINE_UNQUOTED(HAVE_PACKED_OBJECT_VALUE, $ac_result, [Whether struct _zend_object_value is packed])
    AC_DEFINE(HAVE_SPL, 1, [Whether you want SPL (Standard PHP Library) support]) 
--  PHP_NEW_EXTENSION(spl, php_spl.c spl_functions.c spl_engine.c spl_iterators.c spl_array.c spl_directory.c spl_exceptions.c spl_observer.c spl_dllist.c spl_heap.c spl_fixedarray.c, no)
-+  PHP_NEW_EXTENSION(spl, php_spl.c spl_functions.c spl_engine.c spl_iterators.c spl_array.c spl_directory.c spl_exceptions.c spl_observer.c spl_dllist.c spl_heap.c spl_fixedarray.c, $ext_shared)
+-  PHP_NEW_EXTENSION(spl, php_spl.c spl_functions.c spl_engine.c spl_iterators.c spl_array.c spl_directory.c spl_exceptions.c spl_observer.c spl_dllist.c spl_heap.c spl_fixedarray.c, no,, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1)
++  PHP_NEW_EXTENSION(spl, php_spl.c spl_functions.c spl_engine.c spl_iterators.c spl_array.c spl_directory.c spl_exceptions.c spl_observer.c spl_dllist.c spl_heap.c spl_fixedarray.c, $ext_shared,, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1)
    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_dllist.h spl_heap.h spl_fixedarray.h])
    PHP_ADD_EXTENSION_DEP(spl, pcre, true)
 --- php-5.3.1/ext/spl/spl_iterators.c~	2009-07-04 20:31:27.000000000 +0000
@@ -35,8 +35,8 @@
  	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.3.1/ext/spl/spl_iterators.h~	2008-12-31 11:15:49.000000000 +0000
-+++ php-5.3.1/ext/spl/spl_iterators.h	2009-11-27 16:36:35.215748808 +0000
+--- 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;
@@ -47,8 +47,8 @@
 +#else
  extern PHPAPI zend_class_entry *spl_ce_Countable;
 +#endif
- 
- PHP_MINIT_FUNCTION(spl_iterators);
+ 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