Fix tortls.c build with GCC<4.6

apparantly, "pragma GCC diagnostic push/pop" don't exist with older versions.

Fixes bug in 740e592790f570c446cbb5e6d4a77f842f75; bug not in any
released Tor.
This commit is contained in:
Nick Mathewson
2015-01-10 17:25:16 -05:00
parent dc25fb7382
commit b2663298e9
+11 -1
View File
@@ -31,7 +31,13 @@
#endif
#ifdef __GNUC__
#define GCC_VERSION (__GNUC__ * 100 + __GNUC_MINOR__)
#endif
#if __GNUC__ && GCC_VERSION >= 402
#if GCC_VERSION >= 406
#pragma GCC diagnostic push
#endif
/* 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"
@@ -45,8 +51,12 @@
#include <openssl/bio.h>
#include <openssl/opensslv.h>
#ifdef __GNUC__
#if __GNUC__ && GCC_VERSION >= 402
#if GCC_VERSION >= 406
#pragma GCC diagnostic pop
#else
#pragma GCC diagnostic warning "-Wredundant-decls"
#endif
#endif
#ifdef USE_BUFFEREVENTS