diff options
| author | Nick Mathewson <nickm@torproject.org> | 2015-01-10 16:06:25 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2015-01-10 16:06:25 -0500 |
| commit | 740e592790f570c446cbb5e6d4a77f842f75d512 (patch) | |
| tree | f1ff9519a0c4a93f7948e332bafa3debd9c4915a /src/common/tortls.c | |
| parent | 53ecfba2842831d9e500fd383f2ac4e00c258d95 (diff) | |
| download | tor-740e592790f570c446cbb5e6d4a77f842f75d512.tar.gz tor-740e592790f570c446cbb5e6d4a77f842f75d512.zip | |
Ignore warning for redundant decl in openssl/srtp.h
Diffstat (limited to 'src/common/tortls.c')
| -rw-r--r-- | src/common/tortls.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/src/common/tortls.c b/src/common/tortls.c index dd33b330dc..ea6ee0dee4 100644 --- a/src/common/tortls.c +++ b/src/common/tortls.c @@ -29,6 +29,14 @@ #include <ws2tcpip.h> #endif #endif + +#ifdef __GNUC__ +#pragma GCC diagnostic push +/* Some versions of OpenSSL declare SSL_get_selected_srtp_profile twice in + * srtp.h. Suppress the GCC warning so we can build with -Wredundant-decl. */ +#pragma GCC diagnostic ignored "-Wredundant-decls" +#endif + #include <openssl/ssl.h> #include <openssl/ssl3.h> #include <openssl/err.h> @@ -37,6 +45,10 @@ #include <openssl/bio.h> #include <openssl/opensslv.h> +#ifdef __GNUC__ +#pragma GCC diagnostic pop +#endif + #ifdef USE_BUFFEREVENTS #include <event2/bufferevent_ssl.h> #include <event2/buffer.h> |