nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-14 07:03:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix two warnings in test_link_handshake.c

Browse Source 
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.
This commit is contained in:
Nick Mathewson 2016-11-03 11:16:06 -04:00
parent 957bdc4a42
commit 409984c6ae
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/test/test_link_handshake.c
View File

@ -7,8 +7,16 @@
#define CONNECTION_PRIVATE #define CONNECTION_PRIVATE
#define TOR_CHANNEL_INTERNAL_ #define TOR_CHANNEL_INTERNAL_
#define TORTLS_PRIVATE #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/x509.h>
#include <openssl/ssl.h> #include <openssl/ssl.h>
ENABLE_GCC_WARNING(redundant-decls)
#include "or.h" #include "or.h"
#include "config.h" #include "config.h"
#include "connection.h" #include "connection.h"