From: Dmitry Stogov <dmitry@zend.com>
Date: Mon, 15 Sep 2014 10:37:59 +0000 (+0400)
Subject: Merge branch 'master' of git.php.net:php-src
X-Git-Tag: PRE_NATIVE_TLS_MERGE~158^2~85^2~28
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d10bc5c005dbcdfd155068628fd1f99217f9bafe;p=php

Merge branch 'master' of git.php.net:php-src

* 'master' of git.php.net:php-src:
  fix initializer struct
  fix signature
  fix type
  fix condition
---

d10bc5c005dbcdfd155068628fd1f99217f9bafe