浏览代码

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.
Nick Mathewson 9 年之前
父节点
当前提交
409984c6ae
共有 1 个文件被更改,包括 8 次插入0 次删除
  1. 8 0
      src/test/test_link_handshake.c

+ 8 - 0
src/test/test_link_handshake.c

@@ -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"