Merge branch 'PHP-5.5' into PHP-5.6

weltling · weltling · commit 8b8297170ec9 · 2014-08-07T19:50:45.000+02:00
* PHP-5.5:
  fix TS build
diff --git 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;

Original file line number	Diff line number	Diff line change
`@@ -1798,7 +1798,7 @@ static size_t php_openssl_sockop_write(php_stream stream, const char buf, size`
`1798`	`1798`	`}`
`1799`	`1799`	`/* }}} */`
`1800`	`1800`
`1801`		`-static void php_openssl_stream_wait_for_data(php_netstream_data_t *sock TSRMLS_DC)`
	`1801`	`+static void php_openssl_stream_wait_for_data(php_netstream_data_t *sock)`
`1802`	`1802`	`{`
`1803`	`1803`	`int retval;`
`1804`	`1804`	`struct timeval *ptimeout;`