diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-06-14 20:14:53 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-06-14 20:14:53 -0400 |
| commit | d6b01211b94d0f346a408eef78e04a8d0ffbb51f (patch) | |
| tree | 801cc3b286b64fbf2f013ced9e092377d8af3598 /src/common/aes.c | |
| parent | 71aacbe427e2d0c2b970bdc81db4f96c506dd7f3 (diff) | |
| download | tor-d6b01211b94d0f346a408eef78e04a8d0ffbb51f.tar.gz tor-d6b01211b94d0f346a408eef78e04a8d0ffbb51f.zip | |
Resolve the remaining openssl "-Wredundant-decls" warnings.
Another part of 19406
Diffstat (limited to 'src/common/aes.c')
| -rw-r--r-- | src/common/aes.c | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/src/common/aes.c b/src/common/aes.c index c8a17c837f..15970a73f0 100644 --- a/src/common/aes.c +++ b/src/common/aes.c @@ -23,6 +23,19 @@ #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 + #include <assert.h> #include <stdlib.h> #include <string.h> @@ -30,6 +43,15 @@ #include <openssl/evp.h> #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 + #include "compat.h" #include "aes.h" #include "util.h" |