]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.4'
authorDmitry Stogov <dmitry@zend.com>
Mon, 11 Nov 2019 09:09:47 +0000 (12:09 +0300)
committerDmitry Stogov <dmitry@zend.com>
Mon, 11 Nov 2019 09:09:47 +0000 (12:09 +0300)
* PHP-7.4:
  Fixed bug #78714 (funcs returning pointer can't use call convention spec)

1  2 
ext/ffi/ffi.g
ext/ffi/ffi_parser.c

diff --cc ext/ffi/ffi.g
Simple merge
Simple merge