#include <prefs.h> not req'd

svn path=/trunk/; revision=26089
2008-08-25 22:06:20 +00:00 · 2008-08-25 22:06:20 +00:00 · 77b81b391b
parent 74efeaae80
commit 77b81b391b
44 changed files with 0 additions and 48 deletions
--- a/epan/dissectors/packet-csm-encaps.c
+++ b/epan/dissectors/packet-csm-encaps.c
@ -42,7 +42,6 @@
 #include <glib.h>

 #include <epan/packet.h>
-#include <epan/prefs.h>
 #include <epan/reassemble.h>
 #include <epan/conversation.h>
 #include <epan/tap.h>
--- a/epan/dissectors/packet-ctdb.c
+++ b/epan/dissectors/packet-ctdb.c
@ -34,7 +34,6 @@
 #include <glib.h>

 #include <epan/packet.h>
-#include <epan/prefs.h>
 #include <epan/value_string.h>
 #include <epan/conversation.h>
 #include <epan/emem.h>
--- a/epan/dissectors/packet-dcerpc-messenger.c
+++ b/epan/dissectors/packet-dcerpc-messenger.c
@ -28,7 +28,6 @@
 #endif

 #include <glib.h>
-#include <epan/prefs.h>
 #include "packet-dcerpc.h"
 #include "packet-dcerpc-nt.h"
 #include "packet-windows-common.h"
--- a/epan/dissectors/packet-dua.c
+++ b/epan/dissectors/packet-dua.c
@ -37,7 +37,6 @@
 #endif

 #include <epan/packet.h>
-#include <epan/prefs.h>
 #include <epan/sctpppids.h>

 #define NETWORK_BYTE_ORDER          FALSE
--- a/epan/dissectors/packet-egd.c
+++ b/epan/dissectors/packet-egd.c
@ -32,7 +32,6 @@

 #include <string.h>
 #include <epan/packet.h>
-#include <epan/prefs.h>

 /* forward reference */
 void proto_register_egd();
--- a/epan/dissectors/packet-fcp.c
+++ b/epan/dissectors/packet-fcp.c
@ -41,7 +41,6 @@

 #include <glib.h>

-#include <epan/prefs.h>
 #include <epan/emem.h>
 #include <epan/packet.h>
 #include <epan/conversation.h>
--- a/epan/dissectors/packet-fcsb3.c
+++ b/epan/dissectors/packet-fcsb3.c
@ -48,7 +48,6 @@

 #include <glib.h>

-#include <epan/prefs.h>
 #include <epan/packet.h>
 #include <epan/conversation.h>
 #include <epan/etypes.h>
--- a/epan/dissectors/packet-fcsp.c
+++ b/epan/dissectors/packet-fcsp.c
@ -48,7 +48,6 @@

 #include <glib.h>

-#include <epan/prefs.h>
 #include <epan/packet.h>
 #include <epan/conversation.h>
 #include <epan/etypes.h>
--- a/epan/dissectors/packet-fip.c
+++ b/epan/dissectors/packet-fip.c
@ -44,7 +44,6 @@
 #include <glib.h>

 #include <epan/packet.h>
-#include <epan/prefs.h>
 #include <epan/etypes.h>
 #include <epan/expert.h>

--- a/epan/dissectors/packet-fmp_notify.c
+++ b/epan/dissectors/packet-fmp_notify.c
@ -35,7 +35,6 @@
 #include <glib.h>
 #include <gmodule.h>

-#include <epan/prefs.h>
 #include <epan/strutil.h>

 #include "packet-rpc.h"
--- a/epan/dissectors/packet-gsm_a_bssmap.c
+++ b/epan/dissectors/packet-gsm_a_bssmap.c
@ -43,7 +43,6 @@
 #include <string.h>

 #include <epan/packet.h>
-#include <epan/prefs.h>
 #include <epan/tap.h>
 #include <epan/emem.h>

--- a/epan/dissectors/packet-gsm_sms.c
+++ b/epan/dissectors/packet-gsm_sms.c
@ -51,7 +51,6 @@
 #include <string.h>

 #include "epan/packet.h"
-#include <epan/prefs.h>

 #include <glib.h>

--- a/epan/dissectors/packet-h221_nonstd.c
+++ b/epan/dissectors/packet-h221_nonstd.c
@ -34,7 +34,6 @@
 #include <string.h>
 #include <epan/packet.h>
 #include <epan/addr_resolv.h>
-#include <epan/prefs.h>
 #include <epan/strutil.h>
 #include <epan/asn1.h>
 #include <epan/dissectors/packet-per.h>
--- a/epan/dissectors/packet-h263.c
+++ b/epan/dissectors/packet-h263.c
@ -42,8 +42,6 @@
 #include <stdio.h>
 #include <string.h>

-#include "prefs.h"
-
 #include "packet-h263.h"

 static int proto_h263_data		= -1;
--- a/epan/dissectors/packet-homeplug.c
+++ b/epan/dissectors/packet-homeplug.c
@ -31,7 +31,6 @@
 #include <glib.h>

 #include <epan/packet.h>
-#include <epan/prefs.h>

 #include <epan/etypes.h>

--- a/epan/dissectors/packet-ieee802154.c
+++ b/epan/dissectors/packet-ieee802154.c
@ -74,7 +74,6 @@
 #include <sys/stat.h>
 #include <epan/emem.h>
 #include <epan/packet.h>
-#include <epan/prefs.h>
 #include <epan/crc16.h>
 #include <epan/expert.h>
 #include <epan/addr_resolv.h>
--- a/epan/dissectors/packet-imf.c
+++ b/epan/dissectors/packet-imf.c
@ -37,7 +37,6 @@
 #include <epan/packet.h>
 #include <epan/conversation.h>
 #include <epan/addr_resolv.h>
-#include <epan/prefs.h>
 #include <epan/strutil.h>
 #include <epan/emem.h>

--- a/epan/dissectors/packet-iwarp-ddp-rdmap.c
+++ b/epan/dissectors/packet-iwarp-ddp-rdmap.c
@ -36,7 +36,6 @@
 #include <string.h> 
 #include <glib.h> 
 #include <epan/packet.h> 
-#include <epan/prefs.h>

 /* DEFINES */

--- a/epan/dissectors/packet-iwarp-mpa.c
+++ b/epan/dissectors/packet-iwarp-mpa.c
@ -37,7 +37,6 @@
 #include <glib.h>

 #include <epan/packet.h>
-#include <epan/prefs.h>
 #include <epan/emem.h>
 #include <epan/conversation.h>
 #include <epan/dissectors/packet-tcp.h>
--- a/epan/dissectors/packet-lldp.c
+++ b/epan/dissectors/packet-lldp.c
@ -39,7 +39,6 @@
 #include <glib.h>

 #include <epan/packet.h>
-#include <epan/prefs.h>
 #include <epan/emem.h>
 #include <epan/etypes.h>
 #include <epan/oui.h>
--- a/epan/dissectors/packet-mtp3mg.c
+++ b/epan/dissectors/packet-mtp3mg.c
@ -44,7 +44,6 @@
 #include <glib.h>

 #include <epan/packet.h>
-#include <epan/prefs.h>

 #include <packet-mtp3.h>

--- a/epan/dissectors/packet-ncp-nmas.c
+++ b/epan/dissectors/packet-ncp-nmas.c
@ -31,7 +31,6 @@
 #include <string.h>
 #include <glib.h>
 #include <epan/packet.h>
-#include <epan/prefs.h>
 #include <epan/emem.h>
 #include "packet-ncp-int.h"
 #include "packet-ncp-nmas.h"
--- a/epan/dissectors/packet-ncp-sss.c
+++ b/epan/dissectors/packet-ncp-sss.c
@ -32,7 +32,6 @@
 #include <glib.h>
 #include <epan/packet.h>
 #include <epan/strutil.h>
-#include "prefs.h"
 #include "packet-ncp-int.h"
 #include "packet-ncp-sss.h"

--- a/epan/dissectors/packet-nhrp.c
+++ b/epan/dissectors/packet-nhrp.c
@ -43,7 +43,6 @@
 #include <epan/ipproto.h>
 #include <epan/greproto.h>
 #include <epan/sminmpec.h>
-#include <epan/prefs.h>

 #include <epan/in_cksum.h>
 #include "packet-nhrp.h"
--- a/epan/dissectors/packet-pcep.c
+++ b/epan/dissectors/packet-pcep.c
@ -41,7 +41,6 @@
 #include <epan/emem.h>
 #include <epan/dissectors/packet-tcp.h>

-#include <epan/prefs.h>
 #include "packet-frame.h"

 /*differents types of objects*/
--- a/epan/dissectors/packet-pw-eth.c
+++ b/epan/dissectors/packet-pw-eth.c
@ -36,7 +36,6 @@
 #include <string.h>
 #include <glib.h>
 #include <epan/packet.h>
-#include <epan/prefs.h>

 #include "packet-mpls.h"

--- a/epan/dissectors/packet-redback.c
+++ b/epan/dissectors/packet-redback.c
@ -30,7 +30,6 @@
 #include <glib.h>
 #include <epan/packet.h>
 #include <epan/etypes.h>
-#include <epan/prefs.h>
 #include <epan/addr_resolv.h>
 #include "packet-ip.h"

--- a/epan/dissectors/packet-redbackli.c
+++ b/epan/dissectors/packet-redbackli.c
@ -38,7 +38,6 @@
 #include <glib.h>
 #include <epan/packet.h>
 #include <epan/addr_resolv.h>
-#include <epan/prefs.h>
 #include <epan/strutil.h>

 void proto_reg_handoff_redbackli(void);
--- a/epan/dissectors/packet-rfc2190.c
+++ b/epan/dissectors/packet-rfc2190.c
@ -48,8 +48,6 @@
 #include <epan/rtp_pt.h>
 #include <epan/iax2_codec_type.h>

-#include "prefs.h"
-
 #include "packet-h263.h"

 /* H.263 header fields             */
--- a/epan/dissectors/packet-scsi-mmc.c
+++ b/epan/dissectors/packet-scsi-mmc.c
@ -31,7 +31,6 @@
 #include <string.h>
 #include <epan/strutil.h>
 #include <epan/packet.h>
-#include <epan/prefs.h>
 #include <epan/emem.h>
 #include <epan/conversation.h>
 #include <epan/tap.h>
--- a/epan/dissectors/packet-scsi-osd.c
+++ b/epan/dissectors/packet-scsi-osd.c
@ -33,7 +33,6 @@
 #include <string.h>
 #include <epan/strutil.h>
 #include <epan/packet.h>
-#include <epan/prefs.h>
 #include <epan/emem.h>
 #include <epan/conversation.h>
 #include <epan/tap.h>
--- a/epan/dissectors/packet-scsi-sbc.c
+++ b/epan/dissectors/packet-scsi-sbc.c
@ -44,7 +44,6 @@
 #include <string.h>
 #include <epan/strutil.h>
 #include <epan/packet.h>
-#include <epan/prefs.h>
 #include <epan/emem.h>
 #include <epan/conversation.h>
 #include <epan/tap.h>
--- a/epan/dissectors/packet-scsi-smc.c
+++ b/epan/dissectors/packet-scsi-smc.c
@ -35,7 +35,6 @@
 #include <string.h>
 #include <epan/strutil.h>
 #include <epan/packet.h>
-#include <epan/prefs.h>
 #include <epan/emem.h>
 #include <epan/conversation.h>
 #include <epan/tap.h>
--- a/epan/dissectors/packet-scsi-ssc.c
+++ b/epan/dissectors/packet-scsi-ssc.c
@ -39,7 +39,6 @@
 #include <string.h>
 #include <epan/strutil.h>
 #include <epan/packet.h>
-#include <epan/prefs.h>
 #include <epan/emem.h>
 #include <epan/conversation.h>
 #include <epan/tap.h>
--- a/epan/dissectors/packet-synergy.c
+++ b/epan/dissectors/packet-synergy.c
@ -35,9 +35,6 @@
 #include <glib.h>

 #include <epan/packet.h>
-#include <epan/prefs.h>
-
-

 void proto_reg_handoff_synergy(void);

--- a/epan/dissectors/packet-t30.c
+++ b/epan/dissectors/packet-t30.c
@ -34,7 +34,6 @@
 #include <string.h>

 #include "packet-t38.h"
-#include <epan/prefs.h>
 #include <epan/emem.h>

 #include "packet-t30.h"
--- a/epan/dissectors/packet-teamspeak2.c
+++ b/epan/dissectors/packet-teamspeak2.c
@ -29,7 +29,6 @@
 #endif

 #include <epan/packet.h>
-#include <epan/prefs.h>
 #include <epan/crc32.h>
 #include <epan/reassemble.h>
 #include <epan/conversation.h>
--- a/epan/dissectors/packet-tivoconnect.c
+++ b/epan/dissectors/packet-tivoconnect.c
@ -48,7 +48,6 @@
 #include <glib.h>

 #include <epan/packet.h>
-#include <epan/prefs.h>
 #include <epan/ipproto.h>

 /* Forward declaration we need below */
--- a/epan/dissectors/packet-tnef.c
+++ b/epan/dissectors/packet-tnef.c
@ -37,7 +37,6 @@
 #include <epan/packet.h>
 #include <epan/conversation.h>
 #include <epan/addr_resolv.h>
-#include <epan/prefs.h>
 #include <epan/strutil.h>
 #include <epan/emem.h>

--- a/epan/dissectors/packet-usb.c
+++ b/epan/dissectors/packet-usb.c
@ -28,7 +28,6 @@

 #include <glib.h>
 #include <epan/packet.h>
-#include <epan/prefs.h>
 #include <epan/etypes.h>
 #include <epan/addr_resolv.h>
 #include <epan/emem.h>
--- a/epan/dissectors/packet-wlccp.c
+++ b/epan/dissectors/packet-wlccp.c
@ -70,7 +70,6 @@
 #include <glib.h>

 #include <epan/packet.h>
-#include <epan/prefs.h>
 #include <epan/etypes.h>
 #include <epan/oui.h>
 #include "packet-llc.h"
--- a/epan/dissectors/packet-x224.c
+++ b/epan/dissectors/packet-x224.c
@ -34,7 +34,6 @@
 #include "packet-tpkt.h"
 #include "packet-frame.h"
 #include <epan/conversation.h>
-#include <epan/prefs.h>
 #include <epan/emem.h>

 /* X.224 header fields             */
--- a/epan/dissectors/packet-xcsl.c
+++ b/epan/dissectors/packet-xcsl.c
@ -37,7 +37,6 @@
 #include <glib.h>

 #include <epan/packet.h>
-#include <epan/prefs.h>

 /* Pre definitions */
 void   proto_reg_handoff_xcsl(void);
--- a/epan/dissectors/packet-xtp.c
+++ b/epan/dissectors/packet-xtp.c
@ -36,7 +36,6 @@
 #include <glib.h>

 #include <epan/packet.h>
-#include <epan/prefs.h>
 #include <epan/ipproto.h>
 #include <epan/in_cksum.h>