]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.2' into PHP-7.3
authorAnatol Belski <ab@php.net>
Thu, 2 Aug 2018 19:40:50 +0000 (21:40 +0200)
committerAnatol Belski <ab@php.net>
Thu, 2 Aug 2018 19:40:50 +0000 (21:40 +0200)
* PHP-7.2:
  Fix callbacks
  bump version

1  2 
ext/com_dotnet/com_iterator.c
ext/com_dotnet/com_saproxy.c
ext/com_dotnet/com_typeinfo.c
ext/com_dotnet/php_com_dotnet_internal.h

Simple merge
index a8cd9b9214d8918c8407ec947734672b1a21df5d,4fff134178693b09802088344f6d320a2a5ea2d1..68c814f4b4a0efa25bc60def906b1235ca5e4c04
@@@ -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,
Simple merge