[tor-commits] [tor/master] Fix two warnings in test_link_handshake.c

[nickm at torproject.org]

commit 409984c6ae6b28b7f37aba3b137a37a069c65056
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Nov 3 11:16:06 2016 -0400

    Fix two warnings in test_link_handshake.c
    
    One is fixed by disabling the -Wredundant-decls warnings around
    openssl headers here, because of the old double-declaration of
    SSL_get_selected_srtp_profile().
    
    One is fixed by including compat.h before or.h so that we get the
    winsock2.h include before the windows.h include.
---
 src/test/test_link_handshake.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/test/test_link_handshake.c b/src/test/test_link_handshake.c
index 5273f33..9899e54 100644
--- a/src/test/test_link_handshake.c
+++ b/src/test/test_link_handshake.c
@@ -7,8 +7,16 @@
 #define CONNECTION_PRIVATE
 #define TOR_CHANNEL_INTERNAL_
 #define TORTLS_PRIVATE
+
+#include "compat.h"
+
+/* 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. */
+DISABLE_GCC_WARNING(redundant-decls)
 #include <openssl/x509.h>
 #include <openssl/ssl.h>
+ENABLE_GCC_WARNING(redundant-decls)
+
 #include "or.h"
 #include "config.h"
 #include "connection.h"