From: Anatol Belski <ab@php.net>
Date: Wed, 15 Nov 2017 11:45:21 +0000 (+0100)
Subject: Merge branch 'PHP-7.2'
X-Git-Tag: php-7.3.0alpha1~1020
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c6d0c8aa3bac0a4e66b94960863b1f6d49420d7d;p=php

Merge branch 'PHP-7.2'

* PHP-7.2:
  Fix C++ compatibility for TSRM_TLS
---

c6d0c8aa3bac0a4e66b94960863b1f6d49420d7d