]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.2'
authorAnatol Belski <ab@php.net>
Wed, 15 Nov 2017 11:45:21 +0000 (12:45 +0100)
committerAnatol Belski <ab@php.net>
Wed, 15 Nov 2017 11:45:21 +0000 (12:45 +0100)
* PHP-7.2:
  Fix C++ compatibility for TSRM_TLS

1  2 
TSRM/TSRM.h

diff --cc TSRM/TSRM.h
Simple merge