diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-08-19 19:35:26 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-08-19 19:35:26 -0400 |
| commit | 65cf5130ef60b82bae552363bcca53e5ab9cfd02 (patch) | |
| tree | 09f49f80973bc2b02f47de60df0a2731f696389b | |
| parent | 459e5d705eb688642d53f38c00e0a2c6cfd36b8a (diff) | |
| parent | 49843c980a07b73c9e98c7c7983e7745d5d82751 (diff) | |
| download | tor-65cf5130ef60b82bae552363bcca53e5ab9cfd02.tar.gz tor-65cf5130ef60b82bae552363bcca53e5ab9cfd02.zip | |
Merge branch 'bug19903_028_v2' into maint-0.2.8
| -rw-r--r-- | changes/bug19903 | 4 | ||||
| -rw-r--r-- | src/common/tortls.c | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/changes/bug19903 b/changes/bug19903 new file mode 100644 index 0000000000..33aa8789d7 --- /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 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); |