Use DIAG_OFF to suppress -Wunused-function.

Change-Id: I1846e4ef1be977553510ff1473d4c1a7e12cce18
Reviewed-on: https://code.wireshark.org/review/29594
Reviewed-by: Guy Harris <guy@alum.mit.edu>

2 files changed, 10 insertions, 14 deletions

diff --git a/epan/dissectors/asn1/ain/packet-ain-template.c b/epan/dissectors/asn1/ain/packet-ain-template.c
index 7733300b2c..be9cdc493e 100644
--- a/epan/dissectors/asn1/ain/packet-ain-template.c
+++ b/epan/dissectors/asn1/ain/packet-ain-template.c
@@ -22,10 +22,8 @@
 #include "packet-ber.h"
 #include "packet-ansi_tcap.h"
 
-#if defined(__GNUC__)
 /* This is meant to handle dissect_ain_ROS' defined but not used */
-#pragma GCC diagnostic ignored "-Wunused-function"
-#endif
+DIAG_OFF(unused-function)
 
 #define PNAME  "Advanced Intelligent Network"
 #define PSNAME "AIN"
diff --git a/epan/dissectors/packet-ain.c b/epan/dissectors/packet-ain.c
index ea270d8e19..19bf8179b9 100644
--- a/epan/dissectors/packet-ain.c
+++ b/epan/dissectors/packet-ain.c
@@ -30,10 +30,8 @@
 #include "packet-ber.h"
 #include "packet-ansi_tcap.h"
 
-#if defined(__GNUC__)
 /* This is meant to handle dissect_ain_ROS' defined but not used */
-#pragma GCC diagnostic ignored "-Wunused-function"
-#endif
+DIAG_OFF(unused-function)
 
 #define PNAME  "Advanced Intelligent Network"
 #define PSNAME "AIN"
@@ -55,7 +53,7 @@ static dissector_handle_t   ain_handle;
 #define noInvokeId                     NULL
 
 /*--- End of included file: packet-ain-val.h ---*/
-#line 45 "./asn1/ain/packet-ain-template.c"
+#line 43 "./asn1/ain/packet-ain-template.c"
 
 static int hf_ain_ext_type_oid = -1;
 static int hf_ain_odd_even_indicator = -1;
@@ -552,7 +550,7 @@ static int hf_ain_RequestMemorySlot_incoming = -1;
 static int hf_ain_RequestMemorySlot_outgoing = -1;
 
 /*--- End of included file: packet-ain-hf.c ---*/
-#line 53 "./asn1/ain/packet-ain-template.c"
+#line 51 "./asn1/ain/packet-ain-template.c"
 
 /* Initialize the subtree pointers */
 static int ett_ain = -1;
@@ -737,7 +735,7 @@ static gint ett_ain_T_problem = -1;
 static gint ett_ain_InvokeId = -1;
 
 /*--- End of included file: packet-ain-ett.c ---*/
-#line 59 "./asn1/ain/packet-ain-template.c"
+#line 57 "./asn1/ain/packet-ain-template.c"
 
 static expert_field ei_ain_unknown_invokeData = EI_INIT;
 static expert_field ei_ain_unknown_returnResultData = EI_INIT;
@@ -840,7 +838,7 @@ static const value_string ain_err_code_string_vals[] = {
 
 
 /*--- End of included file: packet-ain-table.c ---*/
-#line 81 "./asn1/ain/packet-ain-template.c"
+#line 79 "./asn1/ain/packet-ain-template.c"
 
 
 /*--- Included file: packet-ain-fn.c ---*/
@@ -8966,7 +8964,7 @@ static int dissect_PAR_failureReport_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _
 
 
 /*--- End of included file: packet-ain-fn.c ---*/
-#line 83 "./asn1/ain/packet-ain-template.c"
+#line 81 "./asn1/ain/packet-ain-template.c"
 
 
 /*--- Included file: packet-ain-table2.c ---*/
@@ -9234,7 +9232,7 @@ static int dissect_returnErrorData(proto_tree *tree, tvbuff_t *tvb, int offset,a
 
 
 /*--- End of included file: packet-ain-table2.c ---*/
-#line 85 "./asn1/ain/packet-ain-template.c"
+#line 83 "./asn1/ain/packet-ain-template.c"
 
 
 static int
@@ -11268,7 +11266,7 @@ void proto_register_ain(void) {
         NULL, HFILL }},
 
 /*--- End of included file: packet-ain-hfarr.c ---*/
-#line 182 "./asn1/ain/packet-ain-template.c"
+#line 180 "./asn1/ain/packet-ain-template.c"
     };
 
     /* List of subtrees */
@@ -11454,7 +11452,7 @@ void proto_register_ain(void) {
     &ett_ain_InvokeId,
 
 /*--- End of included file: packet-ain-ettarr.c ---*/
-#line 189 "./asn1/ain/packet-ain-template.c"
+#line 187 "./asn1/ain/packet-ain-template.c"
     };
 
     static ei_register_info ei[] = {