diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-06-14 20:21:02 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-06-14 20:21:02 -0400 |
| commit | 227d3b3d6b0955fe4f0cf1d2081b2ce9649de248 (patch) | |
| tree | 030fc399668b985ecd9c76d305c3b83121f83139 /src/common/aes.c | |
| parent | 8486dea8d7f2d363c4d0d3d093319caa5c728f4e (diff) | |
| download | tor-227d3b3d6b0955fe4f0cf1d2081b2ce9649de248.tar.gz tor-227d3b3d6b0955fe4f0cf1d2081b2ce9649de248.zip | |
Use ENABLE/DISABLE_GCC_WARNING in masater.
Diffstat (limited to 'src/common/aes.c')
| -rw-r--r-- | src/common/aes.c | 21 |
1 files changed, 2 insertions, 19 deletions
diff --git a/src/common/aes.c b/src/common/aes.c index 15970a73f0..e9f78f49f7 100644 --- a/src/common/aes.c +++ b/src/common/aes.c @@ -23,18 +23,7 @@ #error "We require OpenSSL >= 1.0.0" #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" -#endif +DISABLE_GCC_WARNING(redundant-decls) #include <assert.h> #include <stdlib.h> @@ -44,13 +33,7 @@ #include <openssl/engine.h> #include <openssl/modes.h> -#if __GNUC__ && GCC_VERSION >= 402 -#if GCC_VERSION >= 406 -#pragma GCC diagnostic pop -#else -#pragma GCC diagnostic warning "-Wredundant-decls" -#endif -#endif +ENABLE_GCC_WARNING(redundant-decls) #include "compat.h" #include "aes.h" |