commit 49843c980a07b73c9e98c7c7983e7745d5d82751 Author: Nick Mathewson nickm@torproject.org Date: Thu Aug 11 20:29:37 2016 -0400

Avoid confusing GCC 4.2.1 by saying "int foo()... inline int foo() {...}"

Fixes bug 19903; bugfix on 0.2.8.1-alpha. --- changes/bug19903 | 4 ++++ src/common/tortls.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/changes/bug19903 b/changes/bug19903 new file mode 100644 index 0000000..33aa878 --- /dev/null +++ b/changes/bug19903 @@ -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. + diff --git a/src/common/tortls.c b/src/common/tortls.c index b68f5df..9507bb7 100644 --- a/src/common/tortls.c +++ b/src/common/tortls.c @@ -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 * pointer. */ -STATIC inline tor_tls_t * +STATIC tor_tls_t * tor_tls_get_by_ssl(const SSL *ssl) { tor_tls_t *result = SSL_get_ex_data(ssl, tor_tls_object_ex_data_index);