From bebd79aae9ccaf5c96666d38665b69484f1f3eda Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Valverde?= Date: Mon, 16 May 2016 20:16:53 +0100 Subject: parlay: Add another pragma to disable warning MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Use our DIAG_OFF macros instead while at it. Change-Id: I01d8d71a42fb108be156a68f8552ce537a1e2484 Reviewed-on: https://code.wireshark.org/review/15467 Petri-Dish: João Valverde Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde --- epan/dissectors/packet-parlay.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'epan/dissectors/packet-parlay.c') diff --git a/epan/dissectors/packet-parlay.c b/epan/dissectors/packet-parlay.c index 1abcb37fc3..e2d7bd9537 100644 --- a/epan/dissectors/packet-parlay.c +++ b/epan/dissectors/packet-parlay.c @@ -41,14 +41,19 @@ #include #include +#include "ws_diag_control.h" +#include "ws_compiler_tests.h" + #ifdef _MSC_VER /* disable warning: "unreference local variable" */ #pragma warning(disable:4101) #endif -#if defined(__GNUC__) -#pragma GCC diagnostic ignored "-Wunused-function" -#pragma GCC diagnostic ignored "-Wunused-variable" +/* XXX this should be autogenerated, or the warnings fixed in the generator */ +DIAG_OFF(unused-function) +DIAG_OFF(unused-variable) +#if WS_IS_AT_LEAST_GNUC_VERSION(6,0) +DIAG_OFF(unused-const-variable) #endif void proto_register_giop_parlay(void); -- cgit v1.2.3