diff options
| author | Anatol Belski <ab@php.net> | 2014-08-07 19:50:45 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-08-07 19:50:45 +0200 |
| commit | 8b8297170ec9d17f975df4189142d989f9c9b21a (patch) | |
| tree | b0e516572397bcbe46db4b42277f0bc28721ec59 | |
| parent | 6e8de9b4185e55b091a0293397845cb8dd8b79bd (diff) | |
| parent | 75991561d65e3e7dcbb86a056a7d33074ae27231 (diff) | |
| download | php-git-8b8297170ec9d17f975df4189142d989f9c9b21a.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
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 45b3d61d0d..16516e5c09 100644 --- 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; |