From: Anatol Belski <ab@php.net>
Date: Thu, 7 Aug 2014 17:50:45 +0000 (+0200)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: PRE_PHPNG_MERGE~14^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8b8297170ec9d17f975df4189142d989f9c9b21a;p=php

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  fix TS build
---

8b8297170ec9d17f975df4189142d989f9c9b21a
diff --cc ext/openssl/xp_ssl.c
index 45b3d61d0d,b9a30df6cf..16516e5c09
--- a/ext/openssl/xp_ssl.c
+++ b/ext/openssl/xp_ssl.c
@@@ -1796,9 -203,8 +1796,9 @@@ static size_t php_openssl_sockop_write(
  	
  	return didwrite;
  }
 +/* }}} */
  
- static void php_openssl_stream_wait_for_data(php_netstream_data_t *sock TSRMLS_DC)
+ static void php_openssl_stream_wait_for_data(php_netstream_data_t *sock)
  {
  	int retval;
  	struct timeval *ptimeout;