summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/common/tortls.c12
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>