diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-11-03 11:16:06 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-11-03 11:16:06 -0400 |
| commit | 409984c6ae6b28b7f37aba3b137a37a069c65056 (patch) | |
| tree | 54e32a5616b3ecf5bc06fb1e19405bd7e05368c2 /src/test/test_link_handshake.c | |
| parent | 957bdc4a42eca62f0c2d687fe13db7de56c5cb7b (diff) | |
| download | tor-409984c6ae6b28b7f37aba3b137a37a069c65056.tar.gz tor-409984c6ae6b28b7f37aba3b137a37a069c65056.zip | |
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.
Diffstat (limited to 'src/test/test_link_handshake.c')
| -rw-r--r-- | src/test/test_link_handshake.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/test/test_link_handshake.c b/src/test/test_link_handshake.c index 5273f3373f..9899e54231 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" |