Add some missing wmem includes that apparently only show up on Windows.

svn path=/trunk/; revision=50071

diff --git a/asn1/pkcs12/packet-pkcs12-template.c b/asn1/pkcs12/packet-pkcs12-template.c
index b43323b669c0c7148d0394eb3f365c9bd22c52d3..e8d0a7cbef19d5bf0bac7a21a9865c119b3b6430 100644 (file)
--- a/asn1/pkcs12/packet-pkcs12-template.c
+++ b/asn1/pkcs12/packet-pkcs12-template.c
@@ -30,6 +30,7 @@
 #include <epan/oids.h>
 #include <epan/asn1.h>
 #include <epan/prefs.h>
+#include <epan/wmem/wmem.h>
 
 #include "packet-ber.h"
 #include "packet-pkcs12.h"

diff --git a/asn1/rnsap/packet-rnsap-template.c b/asn1/rnsap/packet-rnsap-template.c
index 992e20912255298f99dbd0950ac65c760e8b060c..b6ce3589c31c868bf154e91db17683c585ded2be 100644 (file)
--- a/asn1/rnsap/packet-rnsap-template.c
+++ b/asn1/rnsap/packet-rnsap-template.c
@@ -32,6 +32,7 @@
 
 #include <glib.h>
 #include <epan/packet.h>
+#include <epan/wmem/wmem.h>
 
 #include <epan/asn1.h>
 

diff --git a/epan/dissectors/packet-pkcs12.c b/epan/dissectors/packet-pkcs12.c
index ec17ce5ce6c35003119804ccab580be3d858f144..f6a486eafd0d2b0ff5dd98e2ebf37868f43c2e90 100644 (file)
--- a/epan/dissectors/packet-pkcs12.c
+++ b/epan/dissectors/packet-pkcs12.c
@@ -38,6 +38,7 @@
 #include <epan/oids.h>
 #include <epan/asn1.h>
 #include <epan/prefs.h>
+#include <epan/wmem/wmem.h>
 
 #include "packet-ber.h"
 #include "packet-pkcs12.h"
@@ -143,7 +144,7 @@ static int hf_pkcs12_encryptionScheme = -1;       /* AlgorithmIdentifier */
 static int hf_pkcs12_messageAuthScheme = -1;      /* AlgorithmIdentifier */
 
 /*--- End of included file: packet-pkcs12-hf.c ---*/
-#line 80 "../../asn1/pkcs12/packet-pkcs12-template.c"
+#line 81 "../../asn1/pkcs12/packet-pkcs12-template.c"
 
 /* Initialize the subtree pointers */
 
@@ -171,7 +172,7 @@ static gint ett_pkcs12_PBES2Params = -1;
 static gint ett_pkcs12_PBMAC1Params = -1;
 
 /*--- End of included file: packet-pkcs12-ett.c ---*/
-#line 83 "../../asn1/pkcs12/packet-pkcs12-template.c"
+#line 84 "../../asn1/pkcs12/packet-pkcs12-template.c"
 
 static void append_oid(proto_tree *tree, const char *oid)
 {
@@ -1127,7 +1128,7 @@ static void dissect_PBMAC1Params_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_,
 
 
 /*--- End of included file: packet-pkcs12-fn.c ---*/
-#line 384 "../../asn1/pkcs12/packet-pkcs12-template.c"
+#line 385 "../../asn1/pkcs12/packet-pkcs12-template.c"
 
 static int strip_octet_string(tvbuff_t *tvb)
 {
@@ -1415,7 +1416,7 @@ void proto_register_pkcs12(void) {
         "AlgorithmIdentifier", HFILL }},
 
 /*--- End of included file: packet-pkcs12-hfarr.c ---*/
-#line 451 "../../asn1/pkcs12/packet-pkcs12-template.c"
+#line 452 "../../asn1/pkcs12/packet-pkcs12-template.c"
   };
 
   /* List of subtrees */
@@ -1446,7 +1447,7 @@ void proto_register_pkcs12(void) {
     &ett_pkcs12_PBMAC1Params,
 
 /*--- End of included file: packet-pkcs12-ettarr.c ---*/
-#line 457 "../../asn1/pkcs12/packet-pkcs12-template.c"
+#line 458 "../../asn1/pkcs12/packet-pkcs12-template.c"
   };
   module_t *pkcs12_module;
 
@@ -1507,7 +1508,7 @@ void proto_reg_handoff_pkcs12(void) {
 
 
 /*--- End of included file: packet-pkcs12-dis-tab.c ---*/
-#line 489 "../../asn1/pkcs12/packet-pkcs12-template.c"
+#line 490 "../../asn1/pkcs12/packet-pkcs12-template.c"
 
        register_ber_oid_dissector("1.2.840.113549.1.9.22.1", dissect_X509Certificate_OCTETSTRING_PDU, proto_pkcs12, "x509Certificate");
 

diff --git a/epan/dissectors/packet-rnsap.c b/epan/dissectors/packet-rnsap.c
index 7f60599a557fcae186f262e8c1c16ada73caea65..cd0be4bacba7199503994febaeff2e9353ef4752 100644 (file)
--- a/epan/dissectors/packet-rnsap.c
+++ b/epan/dissectors/packet-rnsap.c
@@ -40,6 +40,7 @@
 
 #include <glib.h>
 #include <epan/packet.h>
+#include <epan/wmem/wmem.h>
 
 #include <epan/asn1.h>
 
@@ -1132,7 +1133,7 @@ typedef enum _ProtocolIE_ID_enum {
 } ProtocolIE_ID_enum;
 
 /*--- End of included file: packet-rnsap-val.h ---*/
-#line 53 "../../asn1/rnsap/packet-rnsap-template.c"
+#line 54 "../../asn1/rnsap/packet-rnsap-template.c"
 
 static dissector_handle_t rrc_dl_dcch_handle = NULL;
 
@@ -3869,7 +3870,7 @@ static int hf_rnsap_value_04 = -1;                /* UnsuccessfulOutcome_value *
 static int hf_rnsap_value_05 = -1;                /* Outcome_value */
 
 /*--- End of included file: packet-rnsap-hf.c ---*/
-#line 60 "../../asn1/rnsap/packet-rnsap-template.c"
+#line 61 "../../asn1/rnsap/packet-rnsap-template.c"
 
 /* Initialize the subtree pointers */
 static int ett_rnsap = -1;
@@ -5156,7 +5157,7 @@ static gint ett_rnsap_UnsuccessfulOutcome = -1;
 static gint ett_rnsap_Outcome = -1;
 
 /*--- End of included file: packet-rnsap-ett.c ---*/
-#line 65 "../../asn1/rnsap/packet-rnsap-template.c"
+#line 66 "../../asn1/rnsap/packet-rnsap-template.c"
 
 /* Global variables */
 static guint32 ProcedureCode;
@@ -43145,7 +43146,7 @@ static int dissect_NULL_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tre
 
 
 /*--- End of included file: packet-rnsap-fn.c ---*/
-#line 89 "../../asn1/rnsap/packet-rnsap-template.c"
+#line 90 "../../asn1/rnsap/packet-rnsap-template.c"
 
 static int dissect_ProtocolIEFieldValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_)
 {
@@ -54107,7 +54108,7 @@ void proto_register_rnsap(void) {
         "Outcome_value", HFILL }},
 
 /*--- End of included file: packet-rnsap-hfarr.c ---*/
-#line 146 "../../asn1/rnsap/packet-rnsap-template.c"
+#line 147 "../../asn1/rnsap/packet-rnsap-template.c"
   };
 
   /* List of subtrees */
@@ -55395,7 +55396,7 @@ void proto_register_rnsap(void) {
     &ett_rnsap_Outcome,
 
 /*--- End of included file: packet-rnsap-ettarr.c ---*/
-#line 152 "../../asn1/rnsap/packet-rnsap-template.c"
+#line 153 "../../asn1/rnsap/packet-rnsap-template.c"
   };
 
 
@@ -56231,7 +56232,7 @@ proto_reg_handoff_rnsap(void)
 
 
 /*--- End of included file: packet-rnsap-dis-tab.c ---*/
-#line 191 "../../asn1/rnsap/packet-rnsap-template.c"
+#line 192 "../../asn1/rnsap/packet-rnsap-template.c"
 }