com php-src: Revert "fix TS build": ext/openssl/xp_ssl.c
| From: | JulienPauli | Date: | Wed, 01 Oct 2014 14:03:07 +0000 |
| Subject: | com php-src: Revert "fix TS build": ext/openssl/xp_ssl.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-82041@lists.php.net to get a copy of this message | ||
Commit: 4cbc55adb1bf348d8037e5c9453039826bf09897
Author: Julien Pauli <jpauli@php.net> Wed, 1 Oct 2014 16:03:07 +0200
Parents: a90785e09ab2b7a02a8fa9638a13a45fe9fe940a
Branches: PHP-5.5.18
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=4cbc55adb1bf348d8037e5c9453039826bf09897
Log:
Revert "fix TS build"
This reverts commit 84a4041ba47e92e7a0ba03938d0ebf88b5fcf6cf.
Changed paths:
M ext/openssl/xp_ssl.c
Diff:
diff --git a/ext/openssl/xp_ssl.c b/ext/openssl/xp_ssl.c
index 5fddf73..b8d1d5b 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)
+static void php_openssl_stream_wait_for_data(php_netstream_data_t *sock TSRMLS_DC)
{
int retval;
struct timeval *ptimeout;