Merge branch 'PHP-5.6'

* PHP-5.6:
  fix TS build
This commit is contained in:
Anatol Belski 2014-08-07 19:51:04 +02:00
commit 6936c7a1bb

View File

@ -1800,7 +1800,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;