diff options
| author | Anatol Belski <ab@php.net> | 2014-08-07 19:50:25 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-08-07 19:50:25 +0200 |
| commit | 75991561d65e3e7dcbb86a056a7d33074ae27231 (patch) | |
| tree | 5c9c51a7ec7333474dff2ee0b7277fbaaef9bf41 /ext | |
| parent | a04c5536bb2aa06a773a753da3eba5fd5010c5cd (diff) | |
| parent | 84a4041ba47e92e7a0ba03938d0ebf88b5fcf6cf (diff) | |
| download | php-git-75991561d65e3e7dcbb86a056a7d33074ae27231.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
fix TS build
Diffstat (limited to 'ext')
| -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 7080a1c6b5..b9a30df6cf 100644 --- a/ext/openssl/xp_ssl.c +++ b/ext/openssl/xp_ssl.c @@ -204,7 +204,7 @@ static size_t php_openssl_sockop_write(php_stream *stream, const char *buf, size 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; |