Merge branch 'bug19903_028_v2' into maint-0.2.8
This commit is contained in:
commit
65cf5130ef
|
@ -0,0 +1,4 @@
|
||||||
|
o Minor bugfixes (compilation):
|
||||||
|
- Remove an inappropriate "inline" in tortls.c that was causing warnings
|
||||||
|
on older versions of GCC. Fixes bug 19903; 0.2.8.1-alpha.
|
||||||
|
|
|
@ -143,7 +143,7 @@ tor_tls_allocate_tor_tls_object_ex_data_index(void)
|
||||||
|
|
||||||
/** Helper: given a SSL* pointer, return the tor_tls_t object using that
|
/** Helper: given a SSL* pointer, return the tor_tls_t object using that
|
||||||
* pointer. */
|
* pointer. */
|
||||||
STATIC inline tor_tls_t *
|
STATIC tor_tls_t *
|
||||||
tor_tls_get_by_ssl(const SSL *ssl)
|
tor_tls_get_by_ssl(const SSL *ssl)
|
||||||
{
|
{
|
||||||
tor_tls_t *result = SSL_get_ex_data(ssl, tor_tls_object_ex_data_index);
|
tor_tls_t *result = SSL_get_ex_data(ssl, tor_tls_object_ex_data_index);
|
||||||
|
|
Loading…
Reference in New Issue