com php-src: Merge branch 'PHP-7.2': ext/com_dotnet/com_ite rator.c ext/com_dotnet/com_saproxy.c ext/com_dotn et/com_typeinfo.c
ext/com_dotnet/php_com_dotnet_i nternal.h

From: Date: Thu, 02 Aug 2018 19:25:29 +0000
Subject: com php-src: Merge branch 'PHP-7.2': ext/com_dotnet/com_ite rator.c ext/com_dotnet/com_saproxy.c ext/com_dotn et/com_typeinfo.c
ext/com_dotnet/php_com_dotnet_i nternal.h
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-102788@lists.php.net to get a copy of this message
Commit: e018a1c98a272eab2fb3660e7e83cca6f3cfb2ee Author: Anatol Belski <ab@php.net> Thu, 2 Aug 2018 21:25:29 +0200 Parents: 580103cb131a95f0152c07b728633638ba5fc87f 91a0a10f715d1c32adab83b55bd970cfbaba9721 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=e018a1c98a272eab2fb3660e7e83cca6f3cfb2ee Log: Merge branch 'PHP-7.2' * 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,

« previous php.cvs (#102788) next »