com php-src: Merge branch 'PHP-7.2' into PHP-7.3: ext/com_dot net/com_iterator.c ext/com_dotnet/com_saproxy.c e xt/com_dotnet/com_typeinfo.c
ext/com_dotnet/php_com _dotnet_internal.h
| From: | Anatol Belski | Date: | Thu, 02 Aug 2018 19:40:50 +0000 |
| Subject: | com php-src: Merge branch 'PHP-7.2' into PHP-7.3: ext/com_dot net/com_iterator.c ext/com_dotnet/com_saproxy.c e xt/com_dotnet/com_typeinfo.c ext/com_dotnet/php_com _dotnet_internal.h |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-102790@lists.php.net to get a copy of this message | ||
Commit: cd07fa48ba74d52bfe700e50dd308d78ac607f55
Author: Anatol Belski <ab@php.net> Thu, 2 Aug 2018 21:40:50 +0200
Parents: 9d7c510893b7e3648fceaa14620e7d9b04721c0f 91a0a10f715d1c32adab83b55bd970cfbaba9721
Branches: PHP-7.3 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=cd07fa48ba74d52bfe700e50dd308d78ac607f55
Log:
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix callbacks
bump version
Changed paths:
MM ext/com_dotnet/com_iterator.c
MM ext/com_dotnet/com_saproxy.c
MM ext/com_dotnet/com_typeinfo.c
MM ext/com_dotnet/php_com_dotnet_internal.h
Diff:
diff --cc ext/com_dotnet/com_saproxy.c
index a8cd9b9,4fff134..68c814f
--- a/ext/com_dotnet/com_saproxy.c
+++ b/ext/com_dotnet/com_saproxy.c
@@@ -518,12 -520,10 +518,10 @@@ static void saproxy_iter_move_forwards(
if (++I->key >= I->imax) {
I->key = -1;
- return FAILURE;
}
- return SUCCESS;
}
-static zend_object_iterator_funcs saproxy_iter_funcs = {
+static const zend_object_iterator_funcs saproxy_iter_funcs = {
saproxy_iter_dtor,
saproxy_iter_valid,
saproxy_iter_get_data,