- updated to 7.1.1

[packages/php.git] / spl-shared.patch

diff --git a/spl-shared.patch b/spl-shared.patch
index 9aea6c46db7b46f854c1872da857ee25a7af6446..cf0fc4ed436bb2e539d6ffded83048d00534063c 100644 (file)
--- a/spl-shared.patch
+++ b/spl-shared.patch
@@ -50,29 +50,31 @@
  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
+--- php-7.1.0alpha2/ext/standard/array.c~      2016-07-04 17:52:16.000000000 +0300
++++ php-7.1.0alpha2/ext/standard/array.c       2016-07-04 18:54:43.937173429 +0300
+@@ -48,6 +48,10 @@
+ #include "zend_smart_str.h"
  #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 @@
+ #define EXTR_SKIP                             1
+--- php-7.1.0alpha1/ext/pdo/pdo.c~     2016-06-07 23:56:47.000000000 +0300
++++ php-7.1.0alpha1/ext/pdo/pdo.c      2016-06-13 23:24:51.238259131 +0300
+@@ -117,7 +117,9 @@
+ 
  /* {{{ pdo_functions[] */
- #if ZEND_MODULE_API_NO >= 20050922
  static const zend_module_dep pdo_deps[] = {
--#ifdef HAVE_SPL
 +#ifdef HAVE_SPL && !COMPILE_DL_SPL
        ZEND_MOD_REQUIRED("spl")
- #endif
-       {NULL, NULL, NULL}
++#endif
+       ZEND_MOD_END
+ };
+ /* }}} */
 --- php-5.3.1/ext/phar/Makefile.frag~  2009-07-23 15:48:04.000000000 +0000
 +++ php-5.3.1/ext/phar/Makefile.frag   2009-11-30 16:10:29.687175948 +0000
 @@ -10,7 +10,7 @@