diff options
| author | Anatol Belski <ab@php.net> | 2014-08-07 19:51:04 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-08-07 19:51:04 +0200 |
| commit | 6936c7a1bb01efc9d0c0f214ab0fbb2478d87e08 (patch) | |
| tree | 7d7c9eaaae11309362ce5dcd32d51d24bfb901d2 | |
| parent | 5542e60c79d74f34eb0d088b510fbc897a86eef5 (diff) | |
| parent | 8b8297170ec9d17f975df4189142d989f9c9b21a (diff) | |
| download | php-git-6936c7a1bb01efc9d0c0f214ab0fbb2478d87e08.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
fix TS build
| -rw-r--r-- | ext/openssl/xp_ssl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/openssl/xp_ssl.c b/ext/openssl/xp_ssl.c index 6a2fa1f062..6a10366cd0 100644 --- a/ext/openssl/xp_ssl.c +++ b/ext/openssl/xp_ssl.c @@ -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; |