Commit 65cf5130 authored by Nick Mathewson's avatar Nick Mathewson 🦀
Browse files

Merge branch 'bug19903_028_v2' into maint-0.2.8

parents 459e5d70 49843c98

changes/bug19903

0 → 100644
+4 −0
Original line number Diff line number Diff line 
  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.

src/common/tortls.c

+1 −1
Original line number Diff line number Diff line
@@ -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);