aboutsummaryrefslogtreecommitdiff
path: root/src/common
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2016-08-11 20:29:37 -0400
committerNick Mathewson <nickm@torproject.org>2016-08-19 19:34:39 -0400
commit49843c980a07b73c9e98c7c7983e7745d5d82751 (patch)
tree060d8667ffc1a92a3e57081d9caaa0eff488a329 /src/common
parentf1973e70a45d9705d3bd547af9cee92ca3611213 (diff)
downloadtor-49843c980a07b73c9e98c7c7983e7745d5d82751.tar.gz
tor-49843c980a07b73c9e98c7c7983e7745d5d82751.zip
Avoid confusing GCC 4.2.1 by saying "int foo()... inline int foo() {...}"
Fixes bug 19903; bugfix on 0.2.8.1-alpha.
Diffstat (limited to 'src/common')
-rw-r--r--src/common/tortls.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/common/tortls.c b/src/common/tortls.c
index b68f5dfcdf..9507bb76e3 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);