When including <epan/prefs.h> don't force inclusion of <epan/uat.h>

svn path=/trunk/; revision=53769

12 files changed, 27 insertions, 12 deletions

diff --git a/epan/decode_as.c b/epan/decode_as.c
index ee4205a29a..9f8791e765 100644
--- a/epan/decode_as.c
+++ b/epan/decode_as.c
@@ -24,6 +24,8 @@
 
 #include "config.h"
 
+#include <stdlib.h>
+
 #include <glib.h>
 
 #include "decode_as.h"
diff --git a/epan/dissectors/packet-bt-dht.c b/epan/dissectors/packet-bt-dht.c
index 1f560097c8..39aee30a35 100644
--- a/epan/dissectors/packet-bt-dht.c
+++ b/epan/dissectors/packet-bt-dht.c
@@ -28,6 +28,8 @@
 
 #include "config.h"
 
+#include <stdlib.h>
+
 #include <epan/packet.h>
 #include <epan/conversation.h>
 #include <epan/prefs.h>
diff --git a/epan/dissectors/packet-camel.c b/epan/dissectors/packet-camel.c
index 4440275b03..bca870f7fb 100644
--- a/epan/dissectors/packet-camel.c
+++ b/epan/dissectors/packet-camel.c
@@ -51,6 +51,7 @@
 #include <epan/asn1.h>
 #include <epan/expert.h>
 
+#include <stdlib.h>
 #include <string.h>
 
 #include "packet-ber.h"
@@ -602,7 +603,7 @@ static int hf_camel_present = -1;                 /* INTEGER */
 static int hf_camel_InvokeId_present = -1;        /* InvokeId_present */
 
 /*--- End of included file: packet-camel-hf.c ---*/
-#line 109 "../../asn1/camel/packet-camel-template.c"
+#line 110 "../../asn1/camel/packet-camel-template.c"
 
 static struct camelsrt_info_t * gp_camelsrt_info;
 
@@ -829,7 +830,7 @@ static gint ett_camel_T_problem = -1;
 static gint ett_camel_InvokeId = -1;
 
 /*--- End of included file: packet-camel-ett.c ---*/
-#line 137 "../../asn1/camel/packet-camel-template.c"
+#line 138 "../../asn1/camel/packet-camel-template.c"
 
 static expert_field ei_camel_unknown_invokeData = EI_INIT;
 static expert_field ei_camel_unknown_returnResultData = EI_INIT;
@@ -1157,7 +1158,7 @@ static const value_string camel_ectTreatmentIndicator_values[] = {
 #define noInvokeId                     NULL
 
 /*--- End of included file: packet-camel-val.h ---*/
-#line 280 "../../asn1/camel/packet-camel-template.c"
+#line 281 "../../asn1/camel/packet-camel-template.c"
 
 
 /*--- Included file: packet-camel-table.c ---*/
@@ -1247,7 +1248,7 @@ static const value_string camel_err_code_string_vals[] = {
 
 
 /*--- End of included file: packet-camel-table.c ---*/
-#line 282 "../../asn1/camel/packet-camel-template.c"
+#line 283 "../../asn1/camel/packet-camel-template.c"
 
 static char camel_number_to_char(int number)
 {
@@ -7010,7 +7011,7 @@ static void dissect_CAP_U_ABORT_REASON_PDU(tvbuff_t *tvb _U_, packet_info *pinfo
 
 
 /*--- End of included file: packet-camel-fn.c ---*/
-#line 329 "../../asn1/camel/packet-camel-template.c"
+#line 330 "../../asn1/camel/packet-camel-template.c"
 
 
 /*--- Included file: packet-camel-table2.c ---*/
@@ -7217,7 +7218,7 @@ static int dissect_returnErrorData(proto_tree *tree, tvbuff_t *tvb, int offset,a
 
 
 /*--- End of included file: packet-camel-table2.c ---*/
-#line 331 "../../asn1/camel/packet-camel-template.c"
+#line 332 "../../asn1/camel/packet-camel-template.c"
 
 
 static guint8 camel_pdu_type = 0;
@@ -7416,7 +7417,7 @@ void proto_reg_handoff_camel(void) {
 
 
 /*--- End of included file: packet-camel-dis-tab.c ---*/
-#line 522 "../../asn1/camel/packet-camel-template.c"
+#line 523 "../../asn1/camel/packet-camel-template.c"
   } else {
     range_foreach(ssn_range, range_delete_callback);
     g_free(ssn_range);
@@ -9530,7 +9531,7 @@ void proto_register_camel(void) {
         "InvokeId_present", HFILL }},
 
 /*--- End of included file: packet-camel-hfarr.c ---*/
-#line 695 "../../asn1/camel/packet-camel-template.c"
+#line 696 "../../asn1/camel/packet-camel-template.c"
   };
 
   /* List of subtrees */
@@ -9745,7 +9746,7 @@ void proto_register_camel(void) {
     &ett_camel_InvokeId,
 
 /*--- End of included file: packet-camel-ettarr.c ---*/
-#line 711 "../../asn1/camel/packet-camel-template.c"
+#line 712 "../../asn1/camel/packet-camel-template.c"
   };
 
   static ei_register_info ei[] = {
diff --git a/epan/dissectors/packet-catapult-dct2000.c b/epan/dissectors/packet-catapult-dct2000.c
index 2367339363..fce2fd63b7 100644
--- a/epan/dissectors/packet-catapult-dct2000.c
+++ b/epan/dissectors/packet-catapult-dct2000.c
@@ -27,6 +27,7 @@
 #include <glib.h>
 
 #include <stdio.h>
+#include <stdlib.h>
 #include <ctype.h>
 
 #include <epan/packet.h>
diff --git a/epan/dissectors/packet-gsm_map.c b/epan/dissectors/packet-gsm_map.c
index e232fa5bd4..bbd8ca377d 100644
--- a/epan/dissectors/packet-gsm_map.c
+++ b/epan/dissectors/packet-gsm_map.c
@@ -62,6 +62,7 @@
 #include <epan/oids.h>
 #include <epan/expert.h>
 
+#include <stdlib.h>
 #include <string.h>
 
 #include <epan/asn1.h>
diff --git a/epan/dissectors/packet-icmp.c b/epan/dissectors/packet-icmp.c
index 1a4bedcdbc..f3fe003319 100644
--- a/epan/dissectors/packet-icmp.c
+++ b/epan/dissectors/packet-icmp.c
@@ -34,6 +34,8 @@
 
 #include "config.h"
 
+#include <stdlib.h>
+
 #include <glib.h>
 #include <time.h>
 
diff --git a/epan/dissectors/packet-memcache.c b/epan/dissectors/packet-memcache.c
index 39aeb6e39b..25fd50f561 100644
--- a/epan/dissectors/packet-memcache.c
+++ b/epan/dissectors/packet-memcache.c
@@ -33,6 +33,7 @@
 #include "config.h"
 
 #include <stdio.h>
+#include <stdlib.h>
 
 #include <glib.h>
 
diff --git a/epan/dissectors/packet-rtpproxy.c b/epan/dissectors/packet-rtpproxy.c
index f0f35f7533..872ffadf92 100644
--- a/epan/dissectors/packet-rtpproxy.c
+++ b/epan/dissectors/packet-rtpproxy.c
@@ -30,6 +30,7 @@
 
 #include "config.h"
 
+#include <stdlib.h>
 #include <ctype.h>
 #include <glib.h>
 
diff --git a/epan/dissectors/packet-rtsp.c b/epan/dissectors/packet-rtsp.c
index a64daefbe6..03afbef167 100644
--- a/epan/dissectors/packet-rtsp.c
+++ b/epan/dissectors/packet-rtsp.c
@@ -32,6 +32,7 @@
 #include "config.h"
 
 #include <stdio.h>
+#include <stdlib.h>
 #include <ctype.h>
 
 #include <glib.h>
diff --git a/epan/dissectors/packet-soupbintcp.c b/epan/dissectors/packet-soupbintcp.c
index 8635df66b3..704c0661fd 100644
--- a/epan/dissectors/packet-soupbintcp.c
+++ b/epan/dissectors/packet-soupbintcp.c
@@ -56,6 +56,8 @@
 
 #include "config.h"
 
+#include <stdlib.h>
+
 #include <epan/conversation.h>
 #include <epan/packet.h>
 #include <epan/prefs.h>
diff --git a/epan/prefs-int.h b/epan/prefs-int.h
index 7438bc3004..52fc65fa6e 100644
--- a/epan/prefs-int.h
+++ b/epan/prefs-int.h
@@ -121,7 +121,7 @@ struct preference {
         gint *enump;
         const char **string;
         range_t **range;
-        uat_t* uat;
+        struct epan_uat* uat;
         color_t *colorp;
         GList** list;
     } varp;                          /**< pointer to variable storing the value */
diff --git a/epan/prefs.h b/epan/prefs.h
index 729ece2a4c..24445dd4ae 100644
--- a/epan/prefs.h
+++ b/epan/prefs.h
@@ -36,7 +36,6 @@ extern "C" {
 #include <epan/addr_resolv.h>
 #include <epan/params.h>
 #include <epan/range.h>
-#include <epan/uat.h>
 
 #include "ws_symbol_export.h"
 
@@ -55,6 +54,8 @@ extern "C" {
 #define ST_MAX_BURSTRES 600000	/* somewhat arbirary limit of 10 minutes */
 #define ST_MAX_BURSTBUCKETS 100	/* somewhat arbirary limit - more buckets degrade performance */
 
+struct epan_uat;
+
 /*
  * Convert a string listing name resolution types to a bitmask of
  * those types.
@@ -455,7 +456,7 @@ WS_DLL_PUBLIC void prefs_register_uat_preference(module_t *module,
 										  const char *name,
 										  const char* title,
 										  const char *description,
-										  uat_t* uat);
+										  struct epan_uat* uat);
 
 /*
  * Register a color preference.  Currently does not have any "GUI Dialog" support