diff options
| author | Hadriel Kaplan <hadrielk@yahoo.com> | 2014-02-06 14:32:59 -0500 |
|---|---|---|
| committer | Martin Kaiser <wireshark@kaiser.cx> | 2014-02-09 13:18:40 +0000 |
| commit | 0353c9a8e357f688cd8d9523ab10a95c7bc8473d (patch) | |
| tree | ebcf65c5c06cca89b3c4050a27a128309976838a | |
| parent | 3fd9a5e6136b4ada0904b632b6ea4082f6401ed4 (diff) | |
| download | wireshark-0353c9a8e357f688cd8d9523ab10a95c7bc8473d.tar.gz | |
Fix Bug 6489 to stop compiler warning on gcrypt deprecated delcarations
The libgcrypt library has several deprecated functions exported, that we don't use.
Unfortunately the GCC compiler warns about these deprecated functions regardless,
which is quite annoying. This commit makes clang/gcc ignore the deprecated attribute,
for gcrypt.h only. The danger with this is if gcrypt ever deprecates a function
we actually *use*, then we won't see the warning. So I'm not sure if it's a good or
bad idea to do this change, but it's really annoying to see the warnings and makes
finding real warnings difficult.
Change-Id: I03e80a6e7e4833ce0f709088c9ab4af98193db3d
Reviewed-on: https://code.wireshark.org/review/128
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
| -rw-r--r-- | wsutil/wsgcrypt.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/wsutil/wsgcrypt.h b/wsutil/wsgcrypt.h index d97d8e20ab..06c9d4b583 100644 --- a/wsutil/wsgcrypt.h +++ b/wsutil/wsgcrypt.h @@ -34,7 +34,7 @@ #ifdef __CLANG__ #pragma clang diagnostic push -#pragma clang diagnostic warning "-Wdeprecated-declarations" +#pragma clang diagnostic ignored "-Wdeprecated-declarations" #include <gcrypt.h> #pragma clang diagnostic pop @@ -59,7 +59,7 @@ /* gcc version is between 4.2.0 and 4.6.0: diagnostic warning/error is supported, diagnostic push/pop is not supported */ -#pragma GCC diagnostic warning "-Wdeprecated-declarations" +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #include <gcrypt.h> #pragma GCC diagnostic error "-Wdeprecated-declarations" @@ -67,7 +67,7 @@ /* gcc version is >= 4.6.0: we can use push/pop */ #pragma GCC diagnostic push -#pragma GCC diagnostic warning "-Wdeprecated-declarations" +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #include <gcrypt.h> #pragma GCC diagnostic pop |