Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5: fix TS build
12 years ago · 8b8297170e
1 changed files with 1 additions and 1 deletions
--- a/ext/openssl/xp_ssl.c
+++ b/ext/openssl/xp_ssl.c
@ -1798,7 +1798,7 @@ static size_t php_openssl_sockop_write(php_stream *stream, const char *buf, size
 }
 /* }}} */

-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;