Browse Source

Ignore warning for redundant decl in openssl/srtp.h

Nick Mathewson 9 years ago
parent
commit
740e592790
1 changed files with 12 additions and 0 deletions
  1. 12 0
      src/common/tortls.c

+ 12 - 0
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>