From a86c5f7cae7ec9a3398300555a0b644689d946a1 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Thu, 19 Sep 2024 06:14:53 +0200
Subject: Merging upstream version 4.4.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 epan/dissectors/asn1/wlancertextn/packet-wlancertextn-template.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'epan/dissectors/asn1/wlancertextn/packet-wlancertextn-template.c')

diff --git a/epan/dissectors/asn1/wlancertextn/packet-wlancertextn-template.c b/epan/dissectors/asn1/wlancertextn/packet-wlancertextn-template.c
index 39a0c220..553f8f35 100644
--- a/epan/dissectors/asn1/wlancertextn/packet-wlancertextn-template.c
+++ b/epan/dissectors/asn1/wlancertextn/packet-wlancertextn-template.c
@@ -15,6 +15,8 @@
 #include <epan/oids.h>
 #include <epan/asn1.h>
 
+#include <wsutil/array.h>
+
 #include "packet-ber.h"
 #include "packet-wlancertextn.h"
 #include "packet-x509af.h"
@@ -29,7 +31,7 @@ void proto_register_wlancertextn(void);
 void proto_reg_handoff_wlancertextn(void);
 
 /* Initialize the protocol and registered fields */
-static int proto_wlancertextn = -1;
+static int proto_wlancertextn;
 #include "packet-wlancertextn-hf.c"
 
 /* Initialize the subtree pointers */
@@ -47,7 +49,7 @@ void proto_register_wlancertextn(void) {
   };
 
   /* List of subtrees */
-  static gint *ett[] = {
+  static int *ett[] = {
 #include "packet-wlancertextn-ettarr.c"
   };
 
-- 
cgit v1.2.3