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

Use ENABLE_GCC_WARNING and DISABLE_GCC_WARNING in tortls.c

Browse Source 
Previously we'd done this ad hoc.
This commit is contained in:
Nick Mathewson 2016-05-27 11:25:42 -04:00
parent 0279e48473
commit 0df2c5677a
1 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/common/tortls.c
View File

@ -24,17 +24,12 @@
#include <ws2tcpip.h>
#endif
#ifdef __GNUC__
#define GCC_VERSION (__GNUC__ * 100 + __GNUC_MINOR__)
#endif
#include "compat.h"
#if __GNUC__ && GCC_VERSION >= 402
#if GCC_VERSION >= 406
#pragma GCC diagnostic push
#endif
#if GCC_VERSION >= 402
/* 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"
DISABLE_GCC_WARNING(redundant-decls)
#endif
#include <openssl/opensslv.h>
@ -53,12 +48,8 @@
#include <openssl/bn.h>
#include <openssl/rsa.h>
#if __GNUC__ && GCC_VERSION >= 402
#if GCC_VERSION >= 406
#pragma GCC diagnostic pop
#else
#pragma GCC diagnostic warning "-Wredundant-decls"
#endif
#if GCC_VERSION >= 402
ENABLE_GCC_WARNING(redundant-decls)
#endif
#ifdef USE_BUFFEREVENTS