diff options
184 files changed, 184 insertions, 184 deletions
diff --git a/Makefile.common b/Makefile.common index b693cfe77d..c843593a1a 100644 --- a/Makefile.common +++ b/Makefile.common @@ -56,7 +56,6 @@ DISSECTOR_SUPPORT_INCLUDES = \ oui.h \ ppptypes.h \ prefs-int.h \ - prefs.h \ ptvcursor.h \ reassemble.h \ req_resp_hdrs.h \ @@ -140,7 +140,7 @@ #include "pcap-util.h" #include "alert_box.h" #include "simple_dialog.h" -#include "prefs.h" +#include <epan/prefs.h> #include "globals.h" #include "conditions.h" #include "capture_stop_conditions.h" diff --git a/capture_combo_utils.c b/capture_combo_utils.c index 9cfd0b2c55..211346b112 100644 --- a/capture_combo_utils.c +++ b/capture_combo_utils.c @@ -36,7 +36,7 @@ #include <string.h> #include <glib.h> -#include "prefs.h" +#include <epan/prefs.h> #include "pcap-util.h" #include "capture_combo_utils.h" @@ -40,7 +40,7 @@ #endif #include <epan/timestamp.h> -#include "prefs.h" +#include <epan/prefs.h> #include "column.h" #include <epan/packet.h> @@ -43,7 +43,7 @@ #include <epan/timestamp.h> #include <epan/plugins.h> #include <epan/filesystem.h> -#include "prefs.h" +#include <epan/prefs.h> #include "util.h" #include "epan/dfilter/dfilter.h" #include "register.h" diff --git a/epan/Makefile.common b/epan/Makefile.common index c1d723fe06..47579b7520 100644 --- a/epan/Makefile.common +++ b/epan/Makefile.common @@ -41,6 +41,7 @@ LIBETHEREAL_SRC = \ osi-utils.c \ packet.c \ plugins.c \ + prefs.c \ proto.c \ range.c \ sna-utils.c \ @@ -77,6 +78,7 @@ LIBETHEREAL_INCLUDES = \ packet_info.h \ pint.h \ plugins.h \ + prefs.h \ proto.h \ range.h \ report_err.h \ @@ -104,7 +106,6 @@ DISSECTOR_SUPPORT_SRC = \ ../h225-persistentdata.c \ ../in_cksum.c \ ../ipproto.c \ - ../prefs.c \ ../ptvcursor.c \ ../reassemble.c \ ../req_resp_hdrs.c \ diff --git a/epan/addr_resolv.c b/epan/addr_resolv.c index 09a6f44564..910bcb9236 100644 --- a/epan/addr_resolv.c +++ b/epan/addr_resolv.c @@ -103,7 +103,7 @@ #include "ipv6-utils.h" #include "addr_resolv.h" #include "filesystem.h" -#include "prefs.h" +#include <epan/prefs.h> #define ENAME_ETHERS "ethers" #define ENAME_IPXNETS "ipxnets" diff --git a/epan/dissectors/packet-acse.c b/epan/dissectors/packet-acse.c index f7a4ed7e2e..75c9652e25 100644 --- a/epan/dissectors/packet-acse.c +++ b/epan/dissectors/packet-acse.c @@ -37,7 +37,7 @@ #include "packet-acse.h" #include "packet-frame.h" -#include "prefs.h" +#include <epan/prefs.h> #include <epan/strutil.h> diff --git a/epan/dissectors/packet-aim-buddylist.c b/epan/dissectors/packet-aim-buddylist.c index 0d3437f6c9..c8988afc7a 100644 --- a/epan/dissectors/packet-aim-buddylist.c +++ b/epan/dissectors/packet-aim-buddylist.c @@ -38,7 +38,7 @@ #include <epan/strutil.h> #include "packet-aim.h" -#include "prefs.h" +#include <epan/prefs.h> #define FAMILY_BUDDYLIST 0x0003 diff --git a/epan/dissectors/packet-aim-chat.c b/epan/dissectors/packet-aim-chat.c index 60c825a372..ecadac346b 100644 --- a/epan/dissectors/packet-aim-chat.c +++ b/epan/dissectors/packet-aim-chat.c @@ -40,7 +40,7 @@ #include "packet-tcp.h" #include "packet-aim.h" -#include "prefs.h" +#include <epan/prefs.h> /* SNAC families */ #define FAMILY_CHAT 0x000E diff --git a/epan/dissectors/packet-aim-generic.c b/epan/dissectors/packet-aim-generic.c index c3b990fbc7..552240dae0 100644 --- a/epan/dissectors/packet-aim-generic.c +++ b/epan/dissectors/packet-aim-generic.c @@ -38,7 +38,7 @@ #include <epan/strutil.h> #include "packet-aim.h" -#include "prefs.h" +#include <epan/prefs.h> #define STRIP_TAGS 1 diff --git a/epan/dissectors/packet-aim.c b/epan/dissectors/packet-aim.c index 3c7f8efc61..66a23f886a 100644 --- a/epan/dissectors/packet-aim.c +++ b/epan/dissectors/packet-aim.c @@ -43,7 +43,7 @@ #include "packet-tcp.h" #include "packet-aim.h" -#include "prefs.h" +#include <epan/prefs.h> #define TCP_PORT_AIM 5190 diff --git a/epan/dissectors/packet-ansi_a.c b/epan/dissectors/packet-ansi_a.c index bc4884c05b..1d16dc539e 100644 --- a/epan/dissectors/packet-ansi_a.c +++ b/epan/dissectors/packet-ansi_a.c @@ -40,7 +40,7 @@ #include <string.h> #include "epan/packet.h" -#include "prefs.h" +#include <epan/prefs.h> #include "tap.h" #include "packet-bssap.h" diff --git a/epan/dissectors/packet-atalk.c b/epan/dissectors/packet-atalk.c index bd340e0358..c37d4f1b8a 100644 --- a/epan/dissectors/packet-atalk.c +++ b/epan/dissectors/packet-atalk.c @@ -40,7 +40,7 @@ #include <epan/atalk-utils.h> #include <epan/conversation.h> -#include "prefs.h" +#include <epan/prefs.h> #include "reassemble.h" #include "packet-afp.h" diff --git a/epan/dissectors/packet-beep.c b/epan/dissectors/packet-beep.c index ab00645d19..c45f7c0a36 100644 --- a/epan/dissectors/packet-beep.c +++ b/epan/dissectors/packet-beep.c @@ -40,7 +40,7 @@ #include <string.h> #include <epan/packet.h> #include <epan/addr_resolv.h> -#include "prefs.h" +#include <epan/prefs.h> #include <epan/conversation.h> #define TCP_PORT_BEEP 10288 diff --git a/epan/dissectors/packet-ber.c b/epan/dissectors/packet-ber.c index 900290a175..896d6e2a01 100644 --- a/epan/dissectors/packet-ber.c +++ b/epan/dissectors/packet-ber.c @@ -43,7 +43,7 @@ #include <epan/packet.h> #include <epan/strutil.h> -#include "prefs.h" +#include <epan/prefs.h> #include "packet-ber.h" diff --git a/epan/dissectors/packet-bgp.c b/epan/dissectors/packet-bgp.c index 0f99e50a85..1dd350108e 100644 --- a/epan/dissectors/packet-bgp.c +++ b/epan/dissectors/packet-bgp.c @@ -61,7 +61,7 @@ #include "packet-ipv6.h" #include "packet-frame.h" #include "afn.h" -#include "prefs.h" +#include <epan/prefs.h> static const value_string bgptypevals[] = { { BGP_OPEN, "OPEN Message" }, diff --git a/epan/dissectors/packet-bootp.c b/epan/dissectors/packet-bootp.c index a7d7cb642b..5b9e3e6093 100644 --- a/epan/dissectors/packet-bootp.c +++ b/epan/dissectors/packet-bootp.c @@ -50,7 +50,7 @@ #include "packet-arp.h" #include "packet-dns.h" /* for get_dns_name() */ -#include "prefs.h" +#include <epan/prefs.h> #include "tap.h" static int bootp_dhcp_tap = -1; diff --git a/epan/dissectors/packet-bssap.c b/epan/dissectors/packet-bssap.c index c422677a99..9722874054 100644 --- a/epan/dissectors/packet-bssap.c +++ b/epan/dissectors/packet-bssap.c @@ -47,7 +47,7 @@ #include <string.h> #include "epan/packet.h" -#include "prefs.h" +#include <epan/prefs.h> #include "packet-bssap.h" #define BSSAP 0 diff --git a/epan/dissectors/packet-bvlc.c b/epan/dissectors/packet-bvlc.c index 16a703d1e5..64bd69092e 100644 --- a/epan/dissectors/packet-bvlc.c +++ b/epan/dissectors/packet-bvlc.c @@ -32,7 +32,7 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> -#include "prefs.h" +#include <epan/prefs.h> #include <epan/strutil.h> #include <glib.h> diff --git a/epan/dissectors/packet-cast.c b/epan/dissectors/packet-cast.c index 0ca8795d5c..d58fc7a0ab 100644 --- a/epan/dissectors/packet-cast.c +++ b/epan/dissectors/packet-cast.c @@ -31,7 +31,7 @@ #include <string.h> #include <epan/packet.h> -#include "prefs.h" +#include <epan/prefs.h> #include "packet-tcp.h" diff --git a/epan/dissectors/packet-chdlc.c b/epan/dissectors/packet-chdlc.c index 9e271fec26..e081b3845a 100644 --- a/epan/dissectors/packet-chdlc.c +++ b/epan/dissectors/packet-chdlc.c @@ -29,7 +29,7 @@ #include <glib.h> #include <epan/packet.h> #include "etypes.h" -#include "prefs.h" +#include <epan/prefs.h> #include "chdlctypes.h" #include <epan/addr_resolv.h> #include "packet-chdlc.h" diff --git a/epan/dissectors/packet-clnp.c b/epan/dissectors/packet-clnp.c index 686e769eac..8386dcc7a2 100644 --- a/epan/dissectors/packet-clnp.c +++ b/epan/dissectors/packet-clnp.c @@ -31,7 +31,7 @@ #include <string.h> #include <ctype.h> #include <glib.h> -#include "prefs.h" +#include <epan/prefs.h> #include <epan/packet.h> #include "reassemble.h" #include "packet-osi.h" diff --git a/epan/dissectors/packet-cops.c b/epan/dissectors/packet-cops.c index a0a5f08c7a..9018595a4a 100644 --- a/epan/dissectors/packet-cops.c +++ b/epan/dissectors/packet-cops.c @@ -71,7 +71,7 @@ #include "asn1.h" #include "format-oid.h" -#include "prefs.h" +#include <epan/prefs.h> /* For PacketCable, port 2126 */ #define TCP_PORT_COPS 3288 diff --git a/epan/dissectors/packet-cpfi.c b/epan/dissectors/packet-cpfi.c index e478a255b6..f159a1f7b1 100644 --- a/epan/dissectors/packet-cpfi.c +++ b/epan/dissectors/packet-cpfi.c @@ -38,7 +38,7 @@ #include <glib.h> #include <epan/packet.h> -#include "prefs.h" +#include <epan/prefs.h> void proto_reg_handoff_cpfi(void); diff --git a/epan/dissectors/packet-dcerpc-mapi.c b/epan/dissectors/packet-dcerpc-mapi.c index 47c4799c23..d19fbef757 100644 --- a/epan/dissectors/packet-dcerpc-mapi.c +++ b/epan/dissectors/packet-dcerpc-mapi.c @@ -33,7 +33,7 @@ #include "packet-dcerpc-nt.h" #include "packet-dcerpc-mapi.h" #include "packet-windows-common.h" /* for "NT_errors[]" */ -#include "prefs.h" +#include <epan/prefs.h> static int proto_dcerpc_mapi = -1; static int hf_mapi_opnum = -1; diff --git a/epan/dissectors/packet-dcerpc-messenger.c b/epan/dissectors/packet-dcerpc-messenger.c index a16353ba13..e3fba3734e 100644 --- a/epan/dissectors/packet-dcerpc-messenger.c +++ b/epan/dissectors/packet-dcerpc-messenger.c @@ -28,7 +28,7 @@ #endif #include <glib.h> -#include "prefs.h" +#include <epan/prefs.h> #include "packet-dcerpc.h" #include "packet-dcerpc-nt.h" #include "packet-windows-common.h" diff --git a/epan/dissectors/packet-dcerpc-samr.c b/epan/dissectors/packet-dcerpc-samr.c index 8e338b16aa..84edd9ada6 100644 --- a/epan/dissectors/packet-dcerpc-samr.c +++ b/epan/dissectors/packet-dcerpc-samr.c @@ -31,7 +31,7 @@ #include <glib.h> #include <epan/packet.h> #include <string.h> -#include "prefs.h" +#include <epan/prefs.h> #include "packet-dcerpc.h" #include "packet-dcerpc-nt.h" #include "packet-dcerpc-samr.h" diff --git a/epan/dissectors/packet-dcerpc.c b/epan/dissectors/packet-dcerpc.c index cf10cbd114..8faf2cc931 100644 --- a/epan/dissectors/packet-dcerpc.c +++ b/epan/dissectors/packet-dcerpc.c @@ -35,7 +35,7 @@ #include <epan/packet.h> #include <epan/dissectors/packet-dcerpc.h> #include <epan/conversation.h> -#include "prefs.h" +#include <epan/prefs.h> #include "reassemble.h" #include "tap.h" #include <epan/dissectors/packet-frame.h> diff --git a/epan/dissectors/packet-diameter.c b/epan/dissectors/packet-diameter.c index 562783a215..a84b6bf06e 100644 --- a/epan/dissectors/packet-diameter.c +++ b/epan/dissectors/packet-diameter.c @@ -49,7 +49,7 @@ #include <epan/packet.h> #include <epan/addr_resolv.h> #include <epan/report_err.h> -#include "prefs.h" +#include <epan/prefs.h> #include "packet-tcp.h" #ifdef NEED_SNPRINTF_H diff --git a/epan/dissectors/packet-distcc.c b/epan/dissectors/packet-distcc.c index 114707bd7e..2bf7449b23 100644 --- a/epan/dissectors/packet-distcc.c +++ b/epan/dissectors/packet-distcc.c @@ -39,7 +39,7 @@ #include <epan/packet.h> #include <epan/strutil.h> -#include "prefs.h" +#include <epan/prefs.h> static int proto_distcc = -1; diff --git a/epan/dissectors/packet-dnp.c b/epan/dissectors/packet-dnp.c index 7e58442869..eecd46cdc8 100644 --- a/epan/dissectors/packet-dnp.c +++ b/epan/dissectors/packet-dnp.c @@ -39,7 +39,7 @@ #endif #include <epan/packet.h> -#include "prefs.h" +#include <epan/prefs.h> #include "reassemble.h" /* DNP 3.0 constants */ diff --git a/epan/dissectors/packet-dns.c b/epan/dissectors/packet-dns.c index fcb87cc4bb..2c4a67a2bf 100644 --- a/epan/dissectors/packet-dns.c +++ b/epan/dissectors/packet-dns.c @@ -41,7 +41,7 @@ #include <epan/addr_resolv.h> #include "packet-dns.h" #include "packet-tcp.h" -#include "prefs.h" +#include <epan/prefs.h> static int proto_dns = -1; static int hf_dns_length = -1; diff --git a/epan/dissectors/packet-dsi.c b/epan/dissectors/packet-dsi.c index 6c985e1928..e82eba3a46 100644 --- a/epan/dissectors/packet-dsi.c +++ b/epan/dissectors/packet-dsi.c @@ -34,7 +34,7 @@ #include <glib.h> #include <epan/packet.h> -#include "prefs.h" +#include <epan/prefs.h> #include "packet-tcp.h" #include "packet-afp.h" diff --git a/epan/dissectors/packet-eth.c b/epan/dissectors/packet-eth.c index 5ec6b04993..c8e1d5839a 100644 --- a/epan/dissectors/packet-eth.c +++ b/epan/dissectors/packet-eth.c @@ -28,7 +28,7 @@ #include <glib.h> #include <epan/packet.h> -#include "prefs.h" +#include <epan/prefs.h> #include "etypes.h" #include <epan/addr_resolv.h> #include "packet-eth.h" diff --git a/epan/dissectors/packet-fc.c b/epan/dissectors/packet-fc.c index 4f823018bd..8285b6072e 100644 --- a/epan/dissectors/packet-fc.c +++ b/epan/dissectors/packet-fc.c @@ -49,7 +49,7 @@ #endif #include <epan/packet.h> -#include "prefs.h" +#include <epan/prefs.h> #include "reassemble.h" #include <epan/conversation.h> #include "etypes.h" diff --git a/epan/dissectors/packet-fcip.c b/epan/dissectors/packet-fcip.c index 98250526ee..ffd364a02d 100644 --- a/epan/dissectors/packet-fcip.c +++ b/epan/dissectors/packet-fcip.c @@ -34,7 +34,7 @@ #include <glib.h> #include <epan/packet.h> -#include "prefs.h" +#include <epan/prefs.h> /* * See: diff --git a/epan/dissectors/packet-fcp.c b/epan/dissectors/packet-fcp.c index b1171e9e9b..c87307587f 100644 --- a/epan/dissectors/packet-fcp.c +++ b/epan/dissectors/packet-fcp.c @@ -51,7 +51,7 @@ # include "snprintf.h" #endif -#include "prefs.h" +#include <epan/prefs.h> #include <epan/packet.h> #include <epan/conversation.h> #include "etypes.h" diff --git a/epan/dissectors/packet-fcsb3.c b/epan/dissectors/packet-fcsb3.c index 84460e0677..3dd975cfed 100644 --- a/epan/dissectors/packet-fcsb3.c +++ b/epan/dissectors/packet-fcsb3.c @@ -52,7 +52,7 @@ # include "snprintf.h" #endif -#include "prefs.h" +#include <epan/prefs.h> #include <epan/packet.h> #include <epan/conversation.h> #include "etypes.h" diff --git a/epan/dissectors/packet-fcsp.c b/epan/dissectors/packet-fcsp.c index df87eea14a..61fb79a23c 100644 --- a/epan/dissectors/packet-fcsp.c +++ b/epan/dissectors/packet-fcsp.c @@ -52,7 +52,7 @@ # include "snprintf.h" #endif -#include "prefs.h" +#include <epan/prefs.h> #include <epan/packet.h> #include <epan/conversation.h> #include "etypes.h" diff --git a/epan/dissectors/packet-fddi.c b/epan/dissectors/packet-fddi.c index 9f7cae488b..b9ca93c508 100644 --- a/epan/dissectors/packet-fddi.c +++ b/epan/dissectors/packet-fddi.c @@ -33,7 +33,7 @@ #include <glib.h> #include <epan/bitswap.h> #include <epan/packet.h> -#include "prefs.h" +#include <epan/prefs.h> #include "packet-fddi.h" #include "packet-llc.h" #include "tap.h" diff --git a/epan/dissectors/packet-fr.c b/epan/dissectors/packet-fr.c index bb99dd18dc..619c1bb1e1 100644 --- a/epan/dissectors/packet-fr.c +++ b/epan/dissectors/packet-fr.c @@ -45,7 +45,7 @@ #include <string.h> #include <glib.h> #include <epan/packet.h> -#include "prefs.h" +#include <epan/prefs.h> #include "packet-llc.h" #include "packet-chdlc.h" #include "xdlc.h" diff --git a/epan/dissectors/packet-frame.c b/epan/dissectors/packet-frame.c index 5d53b752ef..45221d7b5a 100644 --- a/epan/dissectors/packet-frame.c +++ b/epan/dissectors/packet-frame.c @@ -32,7 +32,7 @@ #include <epan/timestamp.h> #include <epan/tvbuff.h> #include "packet-frame.h" -#include "prefs.h" +#include <epan/prefs.h> #include "tap.h" int proto_frame = -1; diff --git a/epan/dissectors/packet-ftam.c b/epan/dissectors/packet-ftam.c index 504c7fc010..0dcad5b0b0 100644 --- a/epan/dissectors/packet-ftam.c +++ b/epan/dissectors/packet-ftam.c @@ -38,7 +38,7 @@ #include "packet-frame.h" #include "packet-ftam.h" -#include "prefs.h" +#include <epan/prefs.h> #include <epan/strutil.h> diff --git a/epan/dissectors/packet-fw1.c b/epan/dissectors/packet-fw1.c index d1c35aa67a..12d2422833 100644 --- a/epan/dissectors/packet-fw1.c +++ b/epan/dissectors/packet-fw1.c @@ -90,7 +90,7 @@ #include <glib.h> #include <epan/packet.h> -#include "prefs.h" +#include <epan/prefs.h> #include "etypes.h" /* Place FW1 summary in proto tree */ diff --git a/epan/dissectors/packet-gsm_a.c b/epan/dissectors/packet-gsm_a.c index c3d2f434f7..7ee33fd642 100644 --- a/epan/dissectors/packet-gsm_a.c +++ b/epan/dissectors/packet-gsm_a.c @@ -69,7 +69,7 @@ #include <string.h> #include "epan/packet.h" -#include "prefs.h" +#include <epan/prefs.h> #include "tap.h" #include "asn1.h" diff --git a/epan/dissectors/packet-gsm_sms.c b/epan/dissectors/packet-gsm_sms.c index 2ae4cb7bd1..ea056fb9de 100644 --- a/epan/dissectors/packet-gsm_sms.c +++ b/epan/dissectors/packet-gsm_sms.c @@ -51,7 +51,7 @@ #include <string.h> #include "epan/packet.h" -#include "prefs.h" +#include <epan/prefs.h> #include "packet-gsm_sms.h" diff --git a/epan/dissectors/packet-gsm_sms_ud.c b/epan/dissectors/packet-gsm_sms_ud.c index fb9ae7b639..542207d213 100644 --- a/epan/dissectors/packet-gsm_sms_ud.c +++ b/epan/dissectors/packet-gsm_sms_ud.c @@ -69,7 +69,7 @@ #include <epan/packet.h> -#include "prefs.h" +#include <epan/prefs.h> #include "reassemble.h" static void dissect_gsm_sms_ud(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree); diff --git a/epan/dissectors/packet-gtp.c b/epan/dissectors/packet-gtp.c index 58fa038fd7..0360336739 100644 --- a/epan/dissectors/packet-gtp.c +++ b/epan/dissectors/packet-gtp.c @@ -36,7 +36,7 @@ #include <glib.h> #include <epan/packet.h> -#include "prefs.h" +#include <epan/prefs.h> #include "packet-gtp.h" #include "packet-ipv6.h" #include "packet-ppp.h" diff --git a/epan/dissectors/packet-h225.c b/epan/dissectors/packet-h225.c index a745f1460c..590a93a3c7 100644 --- a/epan/dissectors/packet-h225.c +++ b/epan/dissectors/packet-h225.c @@ -36,7 +36,7 @@ #include <stdio.h> #include <string.h> -#include "prefs.h" +#include <epan/prefs.h> #include "tap.h" #include "packet-tpkt.h" #include "packet-per.h" diff --git a/epan/dissectors/packet-h245.c b/epan/dissectors/packet-h245.c index 13b9dbb983..8653bffd44 100644 --- a/epan/dissectors/packet-h245.c +++ b/epan/dissectors/packet-h245.c @@ -38,7 +38,7 @@ #include <stdio.h> #include <string.h> -#include "prefs.h" +#include <epan/prefs.h> #include "packet-tpkt.h" #include "packet-per.h" #include "t35.h" diff --git a/epan/dissectors/packet-h450.c b/epan/dissectors/packet-h450.c index fffbd98cda..97f0d0de9a 100644 --- a/epan/dissectors/packet-h450.c +++ b/epan/dissectors/packet-h450.c @@ -36,7 +36,7 @@ #include <stdio.h> #include <string.h> -#include "prefs.h" +#include <epan/prefs.h> #include "packet-per.h" #include "packet-h225.h" #include "packet-h245.h" diff --git a/epan/dissectors/packet-http.c b/epan/dissectors/packet-http.c index 996edf0476..7d502d2c9b 100644 --- a/epan/dissectors/packet-http.c +++ b/epan/dissectors/packet-http.c @@ -44,7 +44,7 @@ #include "req_resp_hdrs.h" #include "packet-http.h" -#include "prefs.h" +#include <epan/prefs.h> typedef enum _http_type { HTTP_REQUEST, diff --git a/epan/dissectors/packet-ieee80211.c b/epan/dissectors/packet-ieee80211.c index 32d58a9e0d..edfd8edfef 100644 --- a/epan/dissectors/packet-ieee80211.c +++ b/epan/dissectors/packet-ieee80211.c @@ -61,7 +61,7 @@ #include <epan/packet.h> #include <epan/addr_resolv.h> #include <epan/strutil.h> -#include "prefs.h" +#include <epan/prefs.h> #include "reassemble.h" #include "packet-ipx.h" #include "packet-llc.h" diff --git a/epan/dissectors/packet-ip.c b/epan/dissectors/packet-ip.c index bb4a45090b..0bdef0c3c8 100644 --- a/epan/dissectors/packet-ip.c +++ b/epan/dissectors/packet-ip.c @@ -38,7 +38,7 @@ #include <epan/addr_resolv.h> #include "ipproto.h" #include "ip_opts.h" -#include "prefs.h" +#include <epan/prefs.h> #include "reassemble.h" #include "etypes.h" #include "greproto.h" diff --git a/epan/dissectors/packet-ipdc.c b/epan/dissectors/packet-ipdc.c index 43cc523ab5..7f91eb09ab 100644 --- a/epan/dissectors/packet-ipdc.c +++ b/epan/dissectors/packet-ipdc.c @@ -46,7 +46,7 @@ #include "packet-tcp.h" #include <epan/packet.h> #include "ipproto.h" -#include "prefs.h" +#include <epan/prefs.h> static int proto_ipdc = -1; static int hf_ipdc_nr = -1; diff --git a/epan/dissectors/packet-ipsec.c b/epan/dissectors/packet-ipsec.c index 76defcd5bf..673affdb54 100644 --- a/epan/dissectors/packet-ipsec.c +++ b/epan/dissectors/packet-ipsec.c @@ -34,7 +34,7 @@ #include "packet-ipsec.h" #include <epan/addr_resolv.h> #include "ipproto.h" -#include "prefs.h" +#include <epan/prefs.h> /* Place AH payload in sub tree */ static gboolean g_ah_payload_in_subtree = FALSE; diff --git a/epan/dissectors/packet-ipv6.c b/epan/dissectors/packet-ipv6.c index a22167cc80..edd485e0cb 100644 --- a/epan/dissectors/packet-ipv6.c +++ b/epan/dissectors/packet-ipv6.c @@ -36,7 +36,7 @@ #include "packet-ipv6.h" #include "ip_opts.h" #include <epan/addr_resolv.h> -#include "prefs.h" +#include <epan/prefs.h> #include "reassemble.h" #include "ipproto.h" #include "etypes.h" diff --git a/epan/dissectors/packet-iscsi.c b/epan/dissectors/packet-iscsi.c index afebdb97f0..5a3d224387 100644 --- a/epan/dissectors/packet-iscsi.c +++ b/epan/dissectors/packet-iscsi.c @@ -35,7 +35,7 @@ #include <glib.h> #include <epan/packet.h> -#include "prefs.h" +#include <epan/prefs.h> #include <epan/conversation.h> #include "packet-scsi.h" #include "epan/nstime.h" diff --git a/epan/dissectors/packet-isns.c b/epan/dissectors/packet-isns.c index 5c6841f517..e8a38af721 100644 --- a/epan/dissectors/packet-isns.c +++ b/epan/dissectors/packet-isns.c @@ -54,7 +54,7 @@ #include <epan/packet.h> #include <epan/conversation.h> #include "packet-tcp.h" -#include "prefs.h" +#include <epan/prefs.h> #define ISNS_PROTO_VER 0x1 diff --git a/epan/dissectors/packet-iua.c b/epan/dissectors/packet-iua.c index 516961cd71..c4224cfe47 100644 --- a/epan/dissectors/packet-iua.c +++ b/epan/dissectors/packet-iua.c @@ -36,7 +36,7 @@ #endif #include <epan/packet.h> -#include "prefs.h" +#include <epan/prefs.h> #include "sctpppids.h" #define NETWORK_BYTE_ORDER FALSE diff --git a/epan/dissectors/packet-kerberos.c b/epan/dissectors/packet-kerberos.c index 00770da3e9..64316338cd 100644 --- a/epan/dissectors/packet-kerberos.c +++ b/epan/dissectors/packet-kerberos.c @@ -61,7 +61,7 @@ #include <epan/dissectors/packet-kerberos.h> #include <epan/dissectors/packet-netbios.h> #include <epan/dissectors/packet-tcp.h> -#include "prefs.h" +#include <epan/prefs.h> #include <epan/dissectors/packet-ber.h> #include <epan/dissectors/packet-pkinit.h> #include <epan/dissectors/packet-cms.h> diff --git a/epan/dissectors/packet-kpasswd.c b/epan/dissectors/packet-kpasswd.c index efd396bca8..a48bb11a65 100644 --- a/epan/dissectors/packet-kpasswd.c +++ b/epan/dissectors/packet-kpasswd.c @@ -31,7 +31,7 @@ #include <epan/packet.h> #include "packet-kerberos.h" -#include "prefs.h" +#include <epan/prefs.h> static int proto_kpasswd = -1; static int hf_kpasswd_message_len = -1; diff --git a/epan/dissectors/packet-laplink.c b/epan/dissectors/packet-laplink.c index 512e11298d..c1d2a41d3c 100644 --- a/epan/dissectors/packet-laplink.c +++ b/epan/dissectors/packet-laplink.c @@ -42,7 +42,7 @@ #include <epan/conversation.h> #include "packet-tcp.h" -#include "prefs.h" +#include <epan/prefs.h> #define TCP_PORT_LAPLINK 1547 #define UDP_PORT_LAPLINK 1547 diff --git a/epan/dissectors/packet-ldap.c b/epan/dissectors/packet-ldap.c index 0efe18f511..476e21d7d6 100644 --- a/epan/dissectors/packet-ldap.c +++ b/epan/dissectors/packet-ldap.c @@ -73,7 +73,7 @@ #include <epan/packet.h> #include "asn1.h" -#include "prefs.h" +#include <epan/prefs.h> #include <epan/conversation.h> #include "packet-frame.h" #include "tap.h" diff --git a/epan/dissectors/packet-ldp.c b/epan/dissectors/packet-ldp.c index ecacef6657..7c1586fa9c 100644 --- a/epan/dissectors/packet-ldp.c +++ b/epan/dissectors/packet-ldp.c @@ -39,7 +39,7 @@ #include <string.h> #include <epan/packet.h> #include <epan/addr_resolv.h> -#include "prefs.h" +#include <epan/prefs.h> #include "afn.h" #include "packet-frame.h" diff --git a/epan/dissectors/packet-lwapp.c b/epan/dissectors/packet-lwapp.c index cad7694900..f2d87cd933 100644 --- a/epan/dissectors/packet-lwapp.c +++ b/epan/dissectors/packet-lwapp.c @@ -40,7 +40,7 @@ #include "xmlstub.h" #include <epan/packet.h> #include <epan/addr_resolv.h> -#include "prefs.h" +#include <epan/prefs.h> #ifdef NEED_SNPRINTF_H diff --git a/epan/dissectors/packet-m2pa.c b/epan/dissectors/packet-m2pa.c index daeee925ef..f12f875f42 100644 --- a/epan/dissectors/packet-m2pa.c +++ b/epan/dissectors/packet-m2pa.c @@ -37,7 +37,7 @@ #endif #include <epan/packet.h> -#include "prefs.h" +#include <epan/prefs.h> #include "sctpppids.h" #define NETWORK_BYTE_ORDER FALSE diff --git a/epan/dissectors/packet-m2ua.c b/epan/dissectors/packet-m2ua.c index 48ab05a047..cea32ec0a6 100644 --- a/epan/dissectors/packet-m2ua.c +++ b/epan/dissectors/packet-m2ua.c @@ -34,7 +34,7 @@ #endif #include <epan/packet.h> -#include "prefs.h" +#include <epan/prefs.h> #include "sctpppids.h" #define SCTP_PORT_M2UA 2904 diff --git a/epan/dissectors/packet-m3ua.c b/epan/dissectors/packet-m3ua.c index 407a394bc2..6a205fa725 100644 --- a/epan/dissectors/packet-m3ua.c +++ b/epan/dissectors/packet-m3ua.c @@ -43,7 +43,7 @@ #include <glib.h> #include <epan/packet.h> -#include "prefs.h" +#include <epan/prefs.h> #include "sctpppids.h" #include "packet-mtp3.h" diff --git a/epan/dissectors/packet-mdshdr.c b/epan/dissectors/packet-mdshdr.c index b99f0b1a6c..794ee6f372 100644 --- a/epan/dissectors/packet-mdshdr.c +++ b/epan/dissectors/packet-mdshdr.c @@ -54,7 +54,7 @@ #include <epan/value_string.h> #include <etypes.h> #include <epan/packet.h> -#include "prefs.h" +#include <epan/prefs.h> #define MDSHDR_VERSION_OFFSET 0 diff --git a/epan/dissectors/packet-mpls-echo.c b/epan/dissectors/packet-mpls-echo.c index 2dde42f368..86e6936678 100644 --- a/epan/dissectors/packet-mpls-echo.c +++ b/epan/dissectors/packet-mpls-echo.c @@ -32,7 +32,7 @@ #include <string.h> #include <glib.h> #include <epan/packet.h> -#include "prefs.h" +#include <epan/prefs.h> #include "packet-ntp.h" #include "packet-ldp.h" diff --git a/epan/dissectors/packet-mpls.c b/epan/dissectors/packet-mpls.c index decd20987f..e88aef39ae 100644 --- a/epan/dissectors/packet-mpls.c +++ b/epan/dissectors/packet-mpls.c @@ -42,7 +42,7 @@ #include <epan/packet.h> #include "ppptypes.h" #include "etypes.h" -#include "prefs.h" +#include <epan/prefs.h> #include "packet-ppp.h" static gint proto_mpls = -1; diff --git a/epan/dissectors/packet-mq.c b/epan/dissectors/packet-mq.c index 237d15b49e..975f286872 100644 --- a/epan/dissectors/packet-mq.c +++ b/epan/dissectors/packet-mq.c @@ -72,7 +72,7 @@ #include <epan/packet.h> #include <epan/conversation.h> #include "reassemble.h" -#include "prefs.h" +#include <epan/prefs.h> #include "packet-tcp.h" #include "packet-mq.h" diff --git a/epan/dissectors/packet-mtp3.c b/epan/dissectors/packet-mtp3.c index d5f628ada5..86f2fb542a 100644 --- a/epan/dissectors/packet-mtp3.c +++ b/epan/dissectors/packet-mtp3.c @@ -45,7 +45,7 @@ #include <epan/packet.h> #include "tap.h" -#include "prefs.h" +#include <epan/prefs.h> /* Initialize the protocol and registered fields */ static int proto_mtp3 = -1; diff --git a/epan/dissectors/packet-mtp3mg.c b/epan/dissectors/packet-mtp3mg.c index 7bc8e4f39b..0d1d4b55b4 100644 --- a/epan/dissectors/packet-mtp3mg.c +++ b/epan/dissectors/packet-mtp3mg.c @@ -44,7 +44,7 @@ #endif #include <epan/packet.h> -#include "prefs.h" +#include <epan/prefs.h> #include <packet-mtp3.h> diff --git a/epan/dissectors/packet-multipart.c b/epan/dissectors/packet-multipart.c index 55942c4ba4..51321ebb88 100644 --- a/epan/dissectors/packet-multipart.c +++ b/epan/dissectors/packet-multipart.c @@ -63,7 +63,7 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> -#include "prefs.h" +#include <epan/prefs.h> #include <glib.h> #include <ctype.h> diff --git a/epan/dissectors/packet-mysql.c b/epan/dissectors/packet-mysql.c index 8f74533cf6..b148dd24af 100644 --- a/epan/dissectors/packet-mysql.c +++ b/epan/dissectors/packet-mysql.c @@ -41,7 +41,7 @@ #include "packet-tcp.h" #include "reassemble.h" -#include "prefs.h" +#include <epan/prefs.h> /* Capabilities */ #define MYSQL_CAPS_LP 0x0001 diff --git a/epan/dissectors/packet-nbns.c b/epan/dissectors/packet-nbns.c index d938fb0aed..c78e535e11 100644 --- a/epan/dissectors/packet-nbns.c +++ b/epan/dissectors/packet-nbns.c @@ -37,7 +37,7 @@ #include "packet-netbios.h" #include "packet-tcp.h" #include "packet-frame.h" -#include "prefs.h" +#include <epan/prefs.h> static int proto_nbns = -1; static int hf_nbns_flags = -1; diff --git a/epan/dissectors/packet-ncp-nmas.c b/epan/dissectors/packet-ncp-nmas.c index 65517acbbc..9fb4870b8f 100644 --- a/epan/dissectors/packet-ncp-nmas.c +++ b/epan/dissectors/packet-ncp-nmas.c @@ -31,7 +31,7 @@ #include <string.h> #include <glib.h> #include <epan/packet.h> -#include "prefs.h" +#include <epan/prefs.h> #include "packet-ncp-int.h" #include "packet-ncp-nmas.h" diff --git a/epan/dissectors/packet-ncp.c b/epan/dissectors/packet-ncp.c index c37046899b..0bf817fe49 100644 --- a/epan/dissectors/packet-ncp.c +++ b/epan/dissectors/packet-ncp.c @@ -45,7 +45,7 @@ #include <string.h> #include <glib.h> #include <epan/packet.h> -#include "prefs.h" +#include <epan/prefs.h> #include "packet-ipx.h" #include "packet-tcp.h" #include "packet-ncp-int.h" diff --git a/epan/dissectors/packet-ndmp.c b/epan/dissectors/packet-ndmp.c index 52b5826c83..eb16e496ba 100644 --- a/epan/dissectors/packet-ndmp.c +++ b/epan/dissectors/packet-ndmp.c @@ -40,7 +40,7 @@ #include "packet-rpc.h" #include "packet-scsi.h" #include "packet-frame.h" -#include "prefs.h" +#include <epan/prefs.h> #include "reassemble.h" #include "rpc_defrag.h" diff --git a/epan/dissectors/packet-ndps.c b/epan/dissectors/packet-ndps.c index 6ab3644735..67a21fe96c 100644 --- a/epan/dissectors/packet-ndps.c +++ b/epan/dissectors/packet-ndps.c @@ -31,7 +31,7 @@ #include <string.h> #include <glib.h> #include <epan/packet.h> -#include "prefs.h" +#include <epan/prefs.h> #include "packet-ipx.h" #include "packet-tcp.h" #include <epan/conversation.h> diff --git a/epan/dissectors/packet-netbios.c b/epan/dissectors/packet-netbios.c index ed1081d34f..364ca9faa5 100644 --- a/epan/dissectors/packet-netbios.c +++ b/epan/dissectors/packet-netbios.c @@ -37,7 +37,7 @@ #include <epan/packet.h> #include "llcsaps.h" #include "reassemble.h" -#include "prefs.h" +#include <epan/prefs.h> #include "packet-netbios.h" /* Netbios command numbers */ diff --git a/epan/dissectors/packet-netflow.c b/epan/dissectors/packet-netflow.c index b07501054e..0d961a1462 100644 --- a/epan/dissectors/packet-netflow.c +++ b/epan/dissectors/packet-netflow.c @@ -58,7 +58,7 @@ #include <epan/packet.h> #include <string.h> -#include "prefs.h" +#include <epan/prefs.h> #define UDP_PORT_NETFLOW 2055 diff --git a/epan/dissectors/packet-nfs.c b/epan/dissectors/packet-nfs.c index 8cf3c0bf3d..1fe997a6cf 100644 --- a/epan/dissectors/packet-nfs.c +++ b/epan/dissectors/packet-nfs.c @@ -36,7 +36,7 @@ #include "packet-rpc.h" #include "packet-nfs.h" -#include "prefs.h" +#include <epan/prefs.h> static int proto_nfs = -1; diff --git a/epan/dissectors/packet-nlm.c b/epan/dissectors/packet-nlm.c index 7aa352c082..24b35f5426 100644 --- a/epan/dissectors/packet-nlm.c +++ b/epan/dissectors/packet-nlm.c @@ -40,7 +40,7 @@ #include "packet-rpc.h" #include "packet-nfs.h" #include "packet-nlm.h" -#include "prefs.h" +#include <epan/prefs.h> #include <string.h> /* diff --git a/epan/dissectors/packet-ntlmssp.c b/epan/dissectors/packet-ntlmssp.c index 0d631aaf12..d3067a26a1 100644 --- a/epan/dissectors/packet-ntlmssp.c +++ b/epan/dissectors/packet-ntlmssp.c @@ -39,7 +39,7 @@ #include "asn1.h" /* XXX - needed for subid_t */ #include "packet-gssapi.h" #include "packet-frame.h" -#include "prefs.h" +#include <epan/prefs.h> #include "crypt-rc4.h" #include "crypt-md4.h" #include "crypt-des.h" diff --git a/epan/dissectors/packet-null.c b/epan/dissectors/packet-null.c index cf0dc20af6..9aa6789953 100644 --- a/epan/dissectors/packet-null.c +++ b/epan/dissectors/packet-null.c @@ -34,7 +34,7 @@ #include <epan/packet.h> #include "packet-null.h" #include <epan/atalk-utils.h> -#include "prefs.h" +#include <epan/prefs.h> #include "packet-ip.h" #include "packet-ipx.h" #include "packet-osi.h" diff --git a/epan/dissectors/packet-per.c b/epan/dissectors/packet-per.c index a18355ee4a..2b8e5df412 100644 --- a/epan/dissectors/packet-per.c +++ b/epan/dissectors/packet-per.c @@ -38,7 +38,7 @@ proper helper routines #include <stdio.h> #include <string.h> -#include "prefs.h" +#include <epan/prefs.h> #include "packet-per.h" diff --git a/epan/dissectors/packet-pgm.c b/epan/dissectors/packet-pgm.c index 8efe72c7d6..d37f1c6b2a 100644 --- a/epan/dissectors/packet-pgm.c +++ b/epan/dissectors/packet-pgm.c @@ -39,7 +39,7 @@ #include "in_cksum.h" #include <epan/addr_resolv.h> #include <epan/strutil.h> -#include "prefs.h" +#include <epan/prefs.h> #include <epan/proto.h> diff --git a/epan/dissectors/packet-ppp.c b/epan/dissectors/packet-ppp.c index 66962677a8..8216c9f9ab 100644 --- a/epan/dissectors/packet-ppp.c +++ b/epan/dissectors/packet-ppp.c @@ -31,7 +31,7 @@ #include <string.h> #include <glib.h> -#include "prefs.h" +#include <epan/prefs.h> #include <epan/packet.h> #include "packet-ppp.h" #include "ppptypes.h" diff --git a/epan/dissectors/packet-pres.c b/epan/dissectors/packet-pres.c index 61b421e285..e45e9719d4 100644 --- a/epan/dissectors/packet-pres.c +++ b/epan/dissectors/packet-pres.c @@ -37,7 +37,7 @@ #include "packet-pres.h" #include "packet-frame.h" -#include "prefs.h" +#include <epan/prefs.h> #include <epan/strutil.h> diff --git a/epan/dissectors/packet-q931.c b/epan/dissectors/packet-q931.c index 1c0715de49..fd8408027b 100644 --- a/epan/dissectors/packet-q931.c +++ b/epan/dissectors/packet-q931.c @@ -37,7 +37,7 @@ #include "nlpid.h" #include "packet-q931.h" #include "packet-e164.h" -#include "prefs.h" +#include <epan/prefs.h> #include "reassemble.h" #include "lapd_sapi.h" diff --git a/epan/dissectors/packet-quake.c b/epan/dissectors/packet-quake.c index 752a19b7b8..f9a4723704 100644 --- a/epan/dissectors/packet-quake.c +++ b/epan/dissectors/packet-quake.c @@ -34,7 +34,7 @@ #include <glib.h> #include <epan/packet.h> #include <epan/conversation.h> -#include "prefs.h" +#include <epan/prefs.h> static int proto_quake = -1; static int hf_quake_header_flags = -1; diff --git a/epan/dissectors/packet-quake2.c b/epan/dissectors/packet-quake2.c index 188077e3e4..24e3ecb0cd 100644 --- a/epan/dissectors/packet-quake2.c +++ b/epan/dissectors/packet-quake2.c @@ -36,7 +36,7 @@ #include <glib.h> #include <epan/packet.h> -#include "prefs.h" +#include <epan/prefs.h> static int proto_quake2 = -1; diff --git a/epan/dissectors/packet-quake3.c b/epan/dissectors/packet-quake3.c index 4bfa93e88f..85ae3aeee6 100644 --- a/epan/dissectors/packet-quake3.c +++ b/epan/dissectors/packet-quake3.c @@ -44,7 +44,7 @@ #include <string.h> #include <glib.h> #include <epan/packet.h> -#include "prefs.h" +#include <epan/prefs.h> #include <epan/addr_resolv.h> static int proto_quake3 = -1; diff --git a/epan/dissectors/packet-quakeworld.c b/epan/dissectors/packet-quakeworld.c index 5af335a52a..dea5e991ce 100644 --- a/epan/dissectors/packet-quakeworld.c +++ b/epan/dissectors/packet-quakeworld.c @@ -34,7 +34,7 @@ #include <glib.h> #include <string.h> #include <epan/packet.h> -#include "prefs.h" +#include <epan/prefs.h> static int proto_quakeworld = -1; diff --git a/epan/dissectors/packet-radius.c b/epan/dissectors/packet-radius.c index 294da2e1bf..be0f49d246 100644 --- a/epan/dissectors/packet-radius.c +++ b/epan/dissectors/packet-radius.c @@ -47,7 +47,7 @@ #include "packet-q931.h" #include "packet-gtp.h" -#include "prefs.h" +#include <epan/prefs.h> #include "crypt-md5.h" static int proto_radius = -1; diff --git a/epan/dissectors/packet-raw.c b/epan/dissectors/packet-raw.c index 77939b5cf7..0fa9207dfa 100644 --- a/epan/dissectors/packet-raw.c +++ b/epan/dissectors/packet-raw.c @@ -31,7 +31,7 @@ #include <string.h> #include <glib.h> #include <epan/packet.h> -#include "prefs.h" +#include <epan/prefs.h> #include "packet-raw.h" #include "packet-ip.h" #include "packet-ppp.h" diff --git a/epan/dissectors/packet-rpc.c b/epan/dissectors/packet-rpc.c index c6b1774569..a904ad38b6 100644 --- a/epan/dissectors/packet-rpc.c +++ b/epan/dissectors/packet-rpc.c @@ -38,7 +38,7 @@ #include "packet-rpc.h" #include "packet-frame.h" #include "packet-tcp.h" -#include "prefs.h" +#include <epan/prefs.h> #include "reassemble.h" #include "rpc_defrag.h" #include "packet-nfs.h" diff --git a/epan/dissectors/packet-rsync.c b/epan/dissectors/packet-rsync.c index b69f8db6ee..3fe9210cc7 100644 --- a/epan/dissectors/packet-rsync.c +++ b/epan/dissectors/packet-rsync.c @@ -39,7 +39,7 @@ #include <epan/strutil.h> #include <epan/conversation.h> -#include "prefs.h" +#include <epan/prefs.h> /* what states make sense here ? */ diff --git a/epan/dissectors/packet-rtcp.c b/epan/dissectors/packet-rtcp.c index 408be00024..d29a4b6a77 100644 --- a/epan/dissectors/packet-rtcp.c +++ b/epan/dissectors/packet-rtcp.c @@ -58,7 +58,7 @@ #endif #include <epan/conversation.h> -#include "prefs.h" +#include <epan/prefs.h> /* Version is the first 2 bits of the first octet*/ diff --git a/epan/dissectors/packet-rtp-events.c b/epan/dissectors/packet-rtp-events.c index 13630e462a..2cb137b399 100644 --- a/epan/dissectors/packet-rtp-events.c +++ b/epan/dissectors/packet-rtp-events.c @@ -35,7 +35,7 @@ #include <glib.h> #include <epan/packet.h> -#include "prefs.h" +#include <epan/prefs.h> #include <stdio.h> #include <string.h> diff --git a/epan/dissectors/packet-rtp.c b/epan/dissectors/packet-rtp.c index 423e0ca026..c6952c5865 100644 --- a/epan/dissectors/packet-rtp.c +++ b/epan/dissectors/packet-rtp.c @@ -66,7 +66,7 @@ #include <epan/conversation.h> #include "tap.h" -#include "prefs.h" +#include <epan/prefs.h> static dissector_handle_t rtp_handle; diff --git a/epan/dissectors/packet-rtsp.c b/epan/dissectors/packet-rtsp.c index 9ef6c856ea..108d10e90a 100644 --- a/epan/dissectors/packet-rtsp.c +++ b/epan/dissectors/packet-rtsp.c @@ -35,7 +35,7 @@ #include <ctype.h> #include <stdlib.h> -#include "prefs.h" +#include <epan/prefs.h> #include <glib.h> #include <epan/packet.h> diff --git a/epan/dissectors/packet-sccp.c b/epan/dissectors/packet-sccp.c index 62833797cb..212deeed72 100644 --- a/epan/dissectors/packet-sccp.c +++ b/epan/dissectors/packet-sccp.c @@ -47,7 +47,7 @@ #include <epan/packet.h> #include "packet-mtp3.h" -#include "prefs.h" +#include <epan/prefs.h> #define SCCP_SI 3 diff --git a/epan/dissectors/packet-scsi.c b/epan/dissectors/packet-scsi.c index 370be66c0c..5a866f6cdf 100644 --- a/epan/dissectors/packet-scsi.c +++ b/epan/dissectors/packet-scsi.c @@ -83,7 +83,7 @@ #include <string.h> #include <epan/strutil.h> #include <epan/packet.h> -#include "prefs.h" +#include <epan/prefs.h> #include "packet-scsi.h" static int proto_scsi = -1; diff --git a/epan/dissectors/packet-sctp.c b/epan/dissectors/packet-sctp.c index c59692d9a6..ba959a002b 100644 --- a/epan/dissectors/packet-sctp.c +++ b/epan/dissectors/packet-sctp.c @@ -46,7 +46,7 @@ #endif #include <string.h> -#include "prefs.h" +#include <epan/prefs.h> #include <epan/packet.h> #include "tap.h" #include "ipproto.h" diff --git a/epan/dissectors/packet-ses.c b/epan/dissectors/packet-ses.c index 6f7960d0fa..b7e792769a 100644 --- a/epan/dissectors/packet-ses.c +++ b/epan/dissectors/packet-ses.c @@ -37,7 +37,7 @@ #include "packet-ses.h" #include "packet-frame.h" -#include "prefs.h" +#include <epan/prefs.h> #include <epan/strutil.h> diff --git a/epan/dissectors/packet-sigcomp.c b/epan/dissectors/packet-sigcomp.c index 19f0edcd83..f69beff82e 100644 --- a/epan/dissectors/packet-sigcomp.c +++ b/epan/dissectors/packet-sigcomp.c @@ -44,7 +44,7 @@ #endif #include <epan/packet.h> -#include "prefs.h" +#include <epan/prefs.h> /* Initialize the protocol and registered fields */ static int proto_sigcomp = -1; diff --git a/epan/dissectors/packet-sip.c b/epan/dissectors/packet-sip.c index 3cb5e1ef01..9fd487f1d9 100644 --- a/epan/dissectors/packet-sip.c +++ b/epan/dissectors/packet-sip.c @@ -50,7 +50,7 @@ #include <string.h> #include <ctype.h> -#include "prefs.h" +#include <epan/prefs.h> #include <glib.h> #include <epan/packet.h> diff --git a/epan/dissectors/packet-skinny.c b/epan/dissectors/packet-skinny.c index c1ef7fade1..89cdbc7626 100644 --- a/epan/dissectors/packet-skinny.c +++ b/epan/dissectors/packet-skinny.c @@ -43,7 +43,7 @@ #include <string.h> #include <epan/packet.h> -#include "prefs.h" +#include <epan/prefs.h> #include "packet-rtp.h" #include "packet-tcp.h" diff --git a/epan/dissectors/packet-slsk.c b/epan/dissectors/packet-slsk.c index ad1b55d9cb..4d4efc4428 100644 --- a/epan/dissectors/packet-slsk.c +++ b/epan/dissectors/packet-slsk.c @@ -44,7 +44,7 @@ #include <epan/packet.h> #include <epan/tvbuff.h> #include "packet-tcp.h" -#include "prefs.h" +#include <epan/prefs.h> /* Initialize the protocol and registered fields */ static int proto_slsk = -1; diff --git a/epan/dissectors/packet-smb.c b/epan/dissectors/packet-smb.c index 96f86b2a8c..5626603cb3 100644 --- a/epan/dissectors/packet-smb.c +++ b/epan/dissectors/packet-smb.c @@ -40,7 +40,7 @@ #include <epan/conversation.h> #include "smb.h" #include <epan/strutil.h> -#include "prefs.h" +#include <epan/prefs.h> #include "reassemble.h" #include "tap.h" #include "packet-ipx.h" diff --git a/epan/dissectors/packet-smpp.c b/epan/dissectors/packet-smpp.c index 0a4161b805..26b5642585 100644 --- a/epan/dissectors/packet-smpp.c +++ b/epan/dissectors/packet-smpp.c @@ -50,7 +50,7 @@ #include <epan/packet.h> -#include "prefs.h" +#include <epan/prefs.h> #include "packet-tcp.h" /* General-purpose debug logger. diff --git a/epan/dissectors/packet-smtp.c b/epan/dissectors/packet-smtp.c index be12066500..a2de5f0c9d 100644 --- a/epan/dissectors/packet-smtp.c +++ b/epan/dissectors/packet-smtp.c @@ -37,7 +37,7 @@ #include <epan/packet.h> #include <epan/conversation.h> #include <epan/addr_resolv.h> -#include "prefs.h" +#include <epan/prefs.h> #include <epan/strutil.h> #define TCP_PORT_SMTP 25 diff --git a/epan/dissectors/packet-sna.c b/epan/dissectors/packet-sna.c index 5890d65262..9fc9603edb 100644 --- a/epan/dissectors/packet-sna.c +++ b/epan/dissectors/packet-sna.c @@ -34,7 +34,7 @@ #include "ppptypes.h" #include <epan/sna-utils.h> #include <epan/charsets.h> -#include "prefs.h" +#include <epan/prefs.h> #include "reassemble.h" /* diff --git a/epan/dissectors/packet-snmp.c b/epan/dissectors/packet-snmp.c index 677ae4dfd2..4a3965a85a 100644 --- a/epan/dissectors/packet-snmp.c +++ b/epan/dissectors/packet-snmp.c @@ -53,7 +53,7 @@ #include <epan/strutil.h> #include <epan/conversation.h> #include "etypes.h" -#include "prefs.h" +#include <epan/prefs.h> #include "packet-ipx.h" #include "packet-hpext.h" #include "packet-frame.h" diff --git a/epan/dissectors/packet-srvloc.c b/epan/dissectors/packet-srvloc.c index fea2c4c7f6..afe99bfdb3 100644 --- a/epan/dissectors/packet-srvloc.c +++ b/epan/dissectors/packet-srvloc.c @@ -47,7 +47,7 @@ #include <epan/packet.h> #include <epan/strutil.h> -#include "prefs.h" +#include <epan/prefs.h> #include "packet-tcp.h" #include "reassemble.h" diff --git a/epan/dissectors/packet-ssh.c b/epan/dissectors/packet-ssh.c index 401b6bcac2..682a6683b1 100644 --- a/epan/dissectors/packet-ssh.c +++ b/epan/dissectors/packet-ssh.c @@ -40,7 +40,7 @@ #include "packet-tcp.h" #include "reassemble.h" -#include "prefs.h" +#include <epan/prefs.h> /* get from openssh ssh2.h */ #define SSH2_MSG_DISCONNECT 1 diff --git a/epan/dissectors/packet-ssl.c b/epan/dissectors/packet-ssl.c index 495c335aaf..3089f94b66 100644 --- a/epan/dissectors/packet-ssl.c +++ b/epan/dissectors/packet-ssl.c @@ -95,7 +95,7 @@ #include <glib.h> #include <epan/conversation.h> -#include "prefs.h" +#include <epan/prefs.h> #include <epan/dissectors/packet-x509af.h> static gboolean ssl_desegment = TRUE; diff --git a/epan/dissectors/packet-sua.c b/epan/dissectors/packet-sua.c index cd90c4e390..1938024028 100644 --- a/epan/dissectors/packet-sua.c +++ b/epan/dissectors/packet-sua.c @@ -33,7 +33,7 @@ #endif #include <epan/packet.h> -#include "prefs.h" +#include <epan/prefs.h> #include "sctpppids.h" #define NETWORK_BYTE_ORDER FALSE diff --git a/epan/dissectors/packet-t38.c b/epan/dissectors/packet-t38.c index a5f02776cc..160ae00e51 100644 --- a/epan/dissectors/packet-t38.c +++ b/epan/dissectors/packet-t38.c @@ -54,10 +54,10 @@ #include <stdio.h> #include <string.h> -#include "prefs.h" +#include <epan/prefs.h> #include "ipproto.h" #include "packet-per.h" -#include "prefs.h" +#include <epan/prefs.h> #include "packet-tpkt.h" #define PORT_T38 6004 diff --git a/epan/dissectors/packet-tacacs.c b/epan/dissectors/packet-tacacs.c index 8968beb5a5..6a3bcac406 100644 --- a/epan/dissectors/packet-tacacs.c +++ b/epan/dissectors/packet-tacacs.c @@ -43,7 +43,7 @@ #include <glib.h> #include <epan/packet.h> -#include "prefs.h" +#include <epan/prefs.h> #include "crypt-md5.h" #include "packet-tacacs.h" diff --git a/epan/dissectors/packet-tali.c b/epan/dissectors/packet-tali.c index 0a080820fa..07b535d148 100644 --- a/epan/dissectors/packet-tali.c +++ b/epan/dissectors/packet-tali.c @@ -39,7 +39,7 @@ #include <glib.h> #include <epan/packet.h> -#include "prefs.h" +#include <epan/prefs.h> #include "packet-tcp.h" #define TALI_SYNC_LENGTH 4 diff --git a/epan/dissectors/packet-tcap.c b/epan/dissectors/packet-tcap.c index e5e3e42ee5..5941e33e3c 100644 --- a/epan/dissectors/packet-tcap.c +++ b/epan/dissectors/packet-tcap.c @@ -60,7 +60,7 @@ #endif #include <epan/packet.h> -#include "prefs.h" +#include <epan/prefs.h> #include "asn1.h" #include "packet-tcap.h" diff --git a/epan/dissectors/packet-tcp.c b/epan/dissectors/packet-tcp.c index 2c02103244..4dbd0a1e41 100644 --- a/epan/dissectors/packet-tcp.c +++ b/epan/dissectors/packet-tcp.c @@ -36,7 +36,7 @@ #include "ipproto.h" #include "ip_opts.h" #include "follow.h" -#include "prefs.h" +#include <epan/prefs.h> #include "packet-tcp.h" #include "packet-ip.h" #include "packet-frame.h" diff --git a/epan/dissectors/packet-tds.c b/epan/dissectors/packet-tds.c index 27f4cd32d0..3fd2c1826a 100644 --- a/epan/dissectors/packet-tds.c +++ b/epan/dissectors/packet-tds.c @@ -158,7 +158,7 @@ #include "packet-frame.h" #include "reassemble.h" -#include "prefs.h" +#include <epan/prefs.h> #define TDS_QUERY_PKT 1 #define TDS_LOGIN_PKT 2 diff --git a/epan/dissectors/packet-teredo.c b/epan/dissectors/packet-teredo.c index b9a10f6ae9..052f970489 100644 --- a/epan/dissectors/packet-teredo.c +++ b/epan/dissectors/packet-teredo.c @@ -39,7 +39,7 @@ #include <epan/packet.h> #include <epan/addr_resolv.h> #include "ipproto.h" -#include "prefs.h" +#include <epan/prefs.h> #include "packet-ip.h" #include "tap.h" diff --git a/epan/dissectors/packet-tns.c b/epan/dissectors/packet-tns.c index b42e75ca51..c54ea8747d 100644 --- a/epan/dissectors/packet-tns.c +++ b/epan/dissectors/packet-tns.c @@ -36,7 +36,7 @@ #include "packet-tcp.h" #include "packet-tns.h" -#include "prefs.h" +#include <epan/prefs.h> /* desegmentation of TNS over TCP */ static gboolean tns_desegment = TRUE; diff --git a/epan/dissectors/packet-tpkt.c b/epan/dissectors/packet-tpkt.c index 1841b4ef37..c3dfee4d80 100644 --- a/epan/dissectors/packet-tpkt.c +++ b/epan/dissectors/packet-tpkt.c @@ -40,7 +40,7 @@ #include "packet-tpkt.h" #include "packet-frame.h" -#include "prefs.h" +#include <epan/prefs.h> /* TPKT header fields */ static int proto_tpkt = -1; diff --git a/epan/dissectors/packet-tr.c b/epan/dissectors/packet-tr.c index 79d1130a6a..d47c12e385 100644 --- a/epan/dissectors/packet-tr.c +++ b/epan/dissectors/packet-tr.c @@ -33,7 +33,7 @@ #include <epan/packet.h> #include "packet-tr.h" #include "packet-llc.h" -#include "prefs.h" +#include <epan/prefs.h> #include "tap.h" static int proto_tr = -1; diff --git a/epan/dissectors/packet-udp.c b/epan/dissectors/packet-udp.c index 89b7b51618..b2a0cfe565 100644 --- a/epan/dissectors/packet-udp.c +++ b/epan/dissectors/packet-udp.c @@ -38,7 +38,7 @@ #include <epan/addr_resolv.h> #include "ipproto.h" #include "in_cksum.h" -#include "prefs.h" +#include <epan/prefs.h> #include "packet-udp.h" diff --git a/epan/dissectors/packet-vj.c b/epan/dissectors/packet-vj.c index 30bbe0cbca..309d53726f 100644 --- a/epan/dissectors/packet-vj.c +++ b/epan/dissectors/packet-vj.c @@ -66,7 +66,7 @@ #include <glib.h> #include <string.h> #include <epan/packet.h> -#include "prefs.h" +#include <epan/prefs.h> #include "packet-ppp.h" #include "ppptypes.h" #include "ipproto.h" diff --git a/epan/dissectors/packet-wbxml.c b/epan/dissectors/packet-wbxml.c index 2ebba21fe4..15b8473000 100644 --- a/epan/dissectors/packet-wbxml.c +++ b/epan/dissectors/packet-wbxml.c @@ -51,7 +51,7 @@ #include <epan/packet.h> -#include "prefs.h" +#include <epan/prefs.h> /* We need the function tvb_get_guintvar() */ #include "packet-wap.h" diff --git a/epan/dissectors/packet-x11.c b/epan/dissectors/packet-x11.c index 9a723d4c41..3bfd6d72ef 100644 --- a/epan/dissectors/packet-x11.c +++ b/epan/dissectors/packet-x11.c @@ -64,7 +64,7 @@ #include <epan/packet.h> #include <epan/conversation.h> -#include "prefs.h" +#include <epan/prefs.h> #include "packet-frame.h" #include "packet-x11-keysymdef.h" diff --git a/epan/dissectors/packet-x25.c b/epan/dissectors/packet-x25.c index 653b5049c1..fb2427f07d 100644 --- a/epan/dissectors/packet-x25.c +++ b/epan/dissectors/packet-x25.c @@ -35,7 +35,7 @@ #include <epan/packet.h> #include <epan/circuit.h> #include "reassemble.h" -#include "prefs.h" +#include <epan/prefs.h> #include "nlpid.h" #include "x264_prt_id.h" diff --git a/epan/dissectors/packet-xot.c b/epan/dissectors/packet-xot.c index 18bb79ceb0..b29b07cb9a 100644 --- a/epan/dissectors/packet-xot.c +++ b/epan/dissectors/packet-xot.c @@ -36,7 +36,7 @@ #include <glib.h> #include <epan/packet.h> #include "packet-tcp.h" -#include "prefs.h" +#include <epan/prefs.h> #define TCP_PORT_XOT 1998 diff --git a/epan/dissectors/packet-ymsg.c b/epan/dissectors/packet-ymsg.c index 29dd3e22f9..55100f084e 100644 --- a/epan/dissectors/packet-ymsg.c +++ b/epan/dissectors/packet-ymsg.c @@ -35,7 +35,7 @@ #include <epan/packet.h> #include "packet-tcp.h" -#include "prefs.h" +#include <epan/prefs.h> static int proto_ymsg = -1; static int hf_ymsg_version = -1; diff --git a/epan/plugins.c b/epan/plugins.c index 6459fab9fa..b60eba9ff7 100644 --- a/epan/plugins.c +++ b/epan/plugins.c @@ -61,7 +61,7 @@ #ifdef PLUGINS_NEED_ADDRESS_TABLE #include "conversation.h" #include "reassemble.h" -#include "prefs.h" +#include <epan/prefs.h> #include <epan/dissectors/packet-giop.h> #include <epan/dissectors/packet-tpkt.h> #include <epan/dissectors/packet-tcp.h> diff --git a/prefs.c b/epan/prefs.c index bafa935e7c..67832e172e 100644 --- a/prefs.c +++ b/epan/prefs.c @@ -40,7 +40,7 @@ #include <epan/filesystem.h> #include <epan/addr_resolv.h> #include <epan/packet.h> -#include "prefs.h" +#include <epan/prefs.h> #include <epan/proto.h> #include "column.h" #include "print.h" diff --git a/prefs.h b/epan/prefs.h index 8f2c274fc1..8f2c274fc1 100644 --- a/prefs.h +++ b/epan/prefs.h @@ -80,7 +80,7 @@ #include "progress_dlg.h" #include "ui_util.h" #include "statusbar.h" -#include "prefs.h" +#include <epan/prefs.h> #include <epan/dfilter/dfilter.h> #include <epan/conversation.h> #include "globals.h" diff --git a/gtk/capture_dlg.c b/gtk/capture_dlg.c index f4447fc5a7..3f5150a0f9 100644 --- a/gtk/capture_dlg.c +++ b/gtk/capture_dlg.c @@ -44,7 +44,7 @@ #include "dlg_utils.h" #include "pcap-util.h" #include "capture_combo_utils.h" -#include "prefs.h" +#include <epan/prefs.h> #include "ringbuffer.h" #include <epan/filesystem.h> #include "compat_macros.h" diff --git a/gtk/capture_prefs.c b/gtk/capture_prefs.c index 7207f1113f..b479380346 100644 --- a/gtk/capture_prefs.c +++ b/gtk/capture_prefs.c @@ -35,7 +35,7 @@ #include "globals.h" #include "capture_prefs.h" #include "gtkglobals.h" -#include "prefs.h" +#include <epan/prefs.h> #include "prefs_dlg.h" #include "ui_util.h" #include "dlg_utils.h" diff --git a/gtk/color_dlg.c b/gtk/color_dlg.c index 1a45a943df..5ae6f19567 100644 --- a/gtk/color_dlg.c +++ b/gtk/color_dlg.c @@ -46,7 +46,7 @@ #include "filter_dlg.h" #include "file_dlg.h" #include "gtkglobals.h" -#include "prefs.h" +#include <epan/prefs.h> static GtkWidget* colorize_dialog_new(char *filter); static void add_filter_to_list(gpointer filter_arg, gpointer list_arg); diff --git a/gtk/column_prefs.c b/gtk/column_prefs.c index 64c22abfc3..7c4370636f 100644 --- a/gtk/column_prefs.c +++ b/gtk/column_prefs.c @@ -31,7 +31,7 @@ #include "globals.h" #include "column_prefs.h" #include "gtkglobals.h" -#include "prefs.h" +#include <epan/prefs.h> #include "column.h" #include "compat_macros.h" #include "ui_util.h" diff --git a/gtk/file_dlg.c b/gtk/file_dlg.c index d93f402652..565754d722 100644 --- a/gtk/file_dlg.c +++ b/gtk/file_dlg.c @@ -46,7 +46,7 @@ #include "file_dlg.h" #include "main.h" #include "compat_macros.h" -#include "prefs.h" +#include <epan/prefs.h> #include "recent.h" #include "color.h" #include "../ui_util.h" diff --git a/gtk/find_dlg.c b/gtk/find_dlg.c index 80810f7fd4..ac9695d589 100644 --- a/gtk/find_dlg.c +++ b/gtk/find_dlg.c @@ -43,7 +43,7 @@ #include "simple_dialog.h" #include "dlg_utils.h" #include "compat_macros.h" -#include "prefs.h" +#include <epan/prefs.h> #include "prefs_dlg.h" #include "keys.h" diff --git a/gtk/follow_dlg.c b/gtk/follow_dlg.c index 684be41d8d..f7208fc48e 100644 --- a/gtk/follow_dlg.c +++ b/gtk/follow_dlg.c @@ -54,7 +54,7 @@ #include "alert_box.h" #include "simple_dialog.h" #include <epan/dissectors/packet-ipv6.h> -#include "prefs.h" +#include <epan/prefs.h> #include <epan/addr_resolv.h> #include <epan/charsets.h> #include "util.h" diff --git a/gtk/font_utils.c b/gtk/font_utils.c index 056e2d6701..37f2cbdf37 100644 --- a/gtk/font_utils.c +++ b/gtk/font_utils.c @@ -38,7 +38,7 @@ #endif #include "recent.h" -#include "prefs.h" +#include <epan/prefs.h> #include "gtkglobals.h" diff --git a/gtk/gui_prefs.c b/gtk/gui_prefs.c index 2b4d5855d7..dcb42ef402 100644 --- a/gtk/gui_prefs.c +++ b/gtk/gui_prefs.c @@ -35,7 +35,7 @@ #include "gtkglobals.h" #include "help_dlg.h" #include "supported_protos_dlg.h" -#include "prefs.h" +#include <epan/prefs.h> #include "prefs_dlg.h" #include "ui_util.h" #include "simple_dialog.h" diff --git a/gtk/help_dlg.c b/gtk/help_dlg.c index 7d1bdc4aac..4b957d9afb 100644 --- a/gtk/help_dlg.c +++ b/gtk/help_dlg.c @@ -35,7 +35,7 @@ #include "epan/filesystem.h" #include "help_dlg.h" #include "text_page.h" -#include "prefs.h" +#include <epan/prefs.h> #include "gtkglobals.h" #include "ui_util.h" #include "compat_macros.h" diff --git a/gtk/layout_prefs.c b/gtk/layout_prefs.c index 36d1edfe7e..b198df8a5c 100644 --- a/gtk/layout_prefs.c +++ b/gtk/layout_prefs.c @@ -32,7 +32,7 @@ #include "layout_prefs.h" #include "gtkglobals.h" /*#include <epan/resolv.h>*/ -#include "prefs.h" +#include <epan/prefs.h> /*#include "prefs_dlg.h"*/ #include "ui_util.h" #include "main.h" diff --git a/gtk/main.c b/gtk/main.c index 0bc5e720e1..b4771686e7 100644 --- a/gtk/main.c +++ b/gtk/main.c @@ -85,7 +85,7 @@ #include "summary.h" #include "filters.h" #include "disabled_protos.h" -#include "prefs.h" +#include <epan/prefs.h> #include "filter_dlg.h" #include "layout_prefs.h" #include "color.h" diff --git a/gtk/menu.c b/gtk/menu.c index 7f5726c982..4bcd04647d 100644 --- a/gtk/menu.c +++ b/gtk/menu.c @@ -35,7 +35,7 @@ #include "tap_menu.h" #include <epan/packet.h> #include <epan/addr_resolv.h> -#include "prefs.h" +#include <epan/prefs.h> #include "about_dlg.h" #include "capture_dlg.h" #include "color_dlg.h" diff --git a/gtk/nameres_prefs.c b/gtk/nameres_prefs.c index 04955ae56e..f3fb415b2d 100644 --- a/gtk/nameres_prefs.c +++ b/gtk/nameres_prefs.c @@ -32,7 +32,7 @@ #include "nameres_prefs.h" #include "gtkglobals.h" #include <epan/addr_resolv.h> -#include "prefs.h" +#include <epan/prefs.h> #include "prefs_dlg.h" #include "ui_util.h" #include "main.h" diff --git a/gtk/packet_list.c b/gtk/packet_list.c index 46e63b95a4..93ffb4c12f 100644 --- a/gtk/packet_list.c +++ b/gtk/packet_list.c @@ -42,7 +42,7 @@ #include "column.h" #include "epan/column_info.h" #include "compat_macros.h" -#include "../prefs.h" +#include <epan/prefs.h> #include "file_dlg.h" #include "packet_list.h" #include "keys.h" diff --git a/gtk/packet_win.c b/gtk/packet_win.c index 38eb1d493c..dbe3946cf8 100644 --- a/gtk/packet_win.c +++ b/gtk/packet_win.c @@ -45,7 +45,7 @@ #include <epan/packet.h> #include "summary.h" #include "file.h" -#include "prefs.h" +#include <epan/prefs.h> #include "menu.h" #include "../menu.h" #include "column.h" diff --git a/gtk/prefs_dlg.c b/gtk/prefs_dlg.c index 9c5b4db37f..63c48915bc 100644 --- a/gtk/prefs_dlg.c +++ b/gtk/prefs_dlg.c @@ -35,7 +35,7 @@ #include "main.h" #include <epan/packet.h> #include "file.h" -#include "prefs.h" +#include <epan/prefs.h> #include "column_prefs.h" #include "print.h" #include "prefs_dlg.h" diff --git a/gtk/print_dlg.c b/gtk/print_dlg.c index aa8531c7de..d73bc57c6d 100644 --- a/gtk/print_dlg.c +++ b/gtk/print_dlg.c @@ -33,7 +33,7 @@ #include "globals.h" #include "keys.h" #include "print.h" -#include "prefs.h" +#include <epan/prefs.h> #include "alert_box.h" #include "simple_dialog.h" #include "file_dlg.h" diff --git a/gtk/print_prefs.c b/gtk/print_prefs.c index c536dbd20e..a55614b82a 100644 --- a/gtk/print_prefs.c +++ b/gtk/print_prefs.c @@ -33,7 +33,7 @@ #include "print_prefs.h" #include "keys.h" #include "print.h" -#include "prefs.h" +#include <epan/prefs.h> #include "prefs_dlg.h" #include "util.h" #include "ui_util.h" diff --git a/gtk/proto_dlg.c b/gtk/proto_dlg.c index cf7580fbe5..5204ea5466 100644 --- a/gtk/proto_dlg.c +++ b/gtk/proto_dlg.c @@ -31,7 +31,7 @@ #include <gdk/gdkkeysyms.h> #include <string.h> -#include "prefs.h" +#include <epan/prefs.h> #include "globals.h" #include "main.h" #include "util.h" diff --git a/gtk/proto_draw.c b/gtk/proto_draw.c index d017ec24f7..b2ddfb9a6c 100644 --- a/gtk/proto_draw.c +++ b/gtk/proto_draw.c @@ -58,7 +58,7 @@ #include "menu.h" #include "keys.h" -#include "prefs.h" +#include <epan/prefs.h> #include "colors.h" #include "file_dlg.h" #include "proto_draw.h" diff --git a/gtk/recent.c b/gtk/recent.c index de5742e116..de198e8a6f 100644 --- a/gtk/recent.c +++ b/gtk/recent.c @@ -36,7 +36,7 @@ #include <epan/filesystem.h> #include "menu.h" #include "main.h" -#include "prefs.h" +#include <epan/prefs.h> #include "prefs-int.h" #include "ui_util.h" #include "dlg_utils.h" diff --git a/gtk/stream_prefs.c b/gtk/stream_prefs.c index ebf80dfd0e..d18b2a406f 100644 --- a/gtk/stream_prefs.c +++ b/gtk/stream_prefs.c @@ -34,7 +34,7 @@ #include "stream_prefs.h" #include "keys.h" #include "print.h" -#include "prefs.h" +#include <epan/prefs.h> #include "compat_macros.h" #include "follow_dlg.h" #include "packet_list.h" diff --git a/gtk/supported_protos_dlg.c b/gtk/supported_protos_dlg.c index 046528eeaf..53bc1486e0 100644 --- a/gtk/supported_protos_dlg.c +++ b/gtk/supported_protos_dlg.c @@ -31,7 +31,7 @@ #include <string.h> #include "supported_protos_dlg.h" -#include "prefs.h" +#include <epan/prefs.h> #include "globals.h" #include "gtkglobals.h" #include "ui_util.h" diff --git a/gtk/toolbar.c b/gtk/toolbar.c index bd3a4dc95e..31625aa43f 100644 --- a/gtk/toolbar.c +++ b/gtk/toolbar.c @@ -52,7 +52,7 @@ #include "goto_dlg.h" #include "color.h" #include "color_dlg.h" -#include "prefs.h" +#include <epan/prefs.h> #include "prefs_dlg.h" #include "main.h" #include "help_dlg.h" diff --git a/gtk/ui_util.c b/gtk/ui_util.c index 9c4e5bf11f..97ab2dbc9c 100644 --- a/gtk/ui_util.c +++ b/gtk/ui_util.c @@ -41,7 +41,7 @@ #include "gtkglobals.h" #include "ui_util.h" -#include "prefs.h" +#include <epan/prefs.h> #include "epan/epan.h" #include "../ui_util.h" #include "compat_macros.h" diff --git a/gtk/webbrowser.c b/gtk/webbrowser.c index e9d28c1584..a483fce19f 100644 --- a/gtk/webbrowser.c +++ b/gtk/webbrowser.c @@ -34,7 +34,7 @@ #include <epan/filesystem.h> -#include "prefs.h" +#include <epan/prefs.h> #include "webbrowser.h" #include "compat_macros.h" #include "simple_dialog.h" diff --git a/plugins/acn/packet-acn.c b/plugins/acn/packet-acn.c index d328f79c84..52ee837ca5 100644 --- a/plugins/acn/packet-acn.c +++ b/plugins/acn/packet-acn.c @@ -43,7 +43,7 @@ #include <string.h> #include <epan/packet.h> #include <epan/addr_resolv.h> -#include "prefs.h" +#include <epan/prefs.h> #include <epan/strutil.h> #include "plugins/plugin_api_defs.h" diff --git a/plugins/artnet/packet-artnet.c b/plugins/artnet/packet-artnet.c index 9130703e59..f2c4ee174f 100644 --- a/plugins/artnet/packet-artnet.c +++ b/plugins/artnet/packet-artnet.c @@ -42,7 +42,7 @@ #include <string.h> #include <epan/packet.h> #include <epan/addr_resolv.h> -#include "prefs.h" +#include <epan/prefs.h> #include <epan/strutil.h> #include "plugins/plugin_api_defs.h" diff --git a/plugins/asn1/packet-asn1.c b/plugins/asn1/packet-asn1.c index d78315d233..5edd07fdc2 100644 --- a/plugins/asn1/packet-asn1.c +++ b/plugins/asn1/packet-asn1.c @@ -79,7 +79,7 @@ #include <string.h> #include <epan/packet.h> #include <epan/addr_resolv.h> -#include "prefs.h" +#include <epan/prefs.h> #include <epan/strutil.h> #include <epan/filesystem.h> #include <epan/report_err.h> diff --git a/plugins/enttec/packet-enttec.c b/plugins/enttec/packet-enttec.c index aed64e4c6c..ae54f1a769 100644 --- a/plugins/enttec/packet-enttec.c +++ b/plugins/enttec/packet-enttec.c @@ -42,7 +42,7 @@ #include <string.h> #include <epan/packet.h> #include <epan/addr_resolv.h> -#include "prefs.h" +#include <epan/prefs.h> #include <epan/strutil.h> #include "plugins/plugin_api_defs.h" diff --git a/plugins/gryphon/packet-gryphon.c b/plugins/gryphon/packet-gryphon.c index 3d56f5e2d2..dbfef47deb 100644 --- a/plugins/gryphon/packet-gryphon.c +++ b/plugins/gryphon/packet-gryphon.c @@ -40,7 +40,7 @@ #include <epan/packet.h> #include "packet-gryphon.h" #include <epan/dissectors/packet-tcp.h> -#include "prefs.h" +#include <epan/prefs.h> #include "plugins/plugin_api_defs.h" diff --git a/plugins/lwres/packet-lwres.c b/plugins/lwres/packet-lwres.c index a69441dfbb..1329ad9493 100644 --- a/plugins/lwres/packet-lwres.c +++ b/plugins/lwres/packet-lwres.c @@ -36,7 +36,7 @@ #include <ctype.h> #include <time.h> #include <string.h> -#include "prefs.h" +#include <epan/prefs.h> #include "plugins/plugin_api_defs.h" #define LWRES_LWPACKET_LENGTH (4 * 5 + 2 * 4) diff --git a/plugins/megaco/packet-megaco.c b/plugins/megaco/packet-megaco.c index a8ab911bd8..fc5a642bbf 100644 --- a/plugins/megaco/packet-megaco.c +++ b/plugins/megaco/packet-megaco.c @@ -50,7 +50,7 @@ #include <string.h> #include <epan/packet.h> #include <epan/addr_resolv.h> -#include "prefs.h" +#include <epan/prefs.h> #include <epan/strutil.h> #include "sctpppids.h" #include <epan/dissectors/packet-tpkt.h> diff --git a/plugins/mgcp/packet-mgcp.c b/plugins/mgcp/packet-mgcp.c index 2c163d368f..1efdd2df54 100644 --- a/plugins/mgcp/packet-mgcp.c +++ b/plugins/mgcp/packet-mgcp.c @@ -50,7 +50,7 @@ #include <string.h> #include <epan/packet.h> #include <epan/addr_resolv.h> -#include "prefs.h" +#include <epan/prefs.h> #include <epan/strutil.h> #include <epan/conversation.h> #include "packet-mgcp.h" diff --git a/plugins/opsi/packet-opsi.c b/plugins/opsi/packet-opsi.c index 2dc26cb3c4..546eded413 100644 --- a/plugins/opsi/packet-opsi.c +++ b/plugins/opsi/packet-opsi.c @@ -44,7 +44,7 @@ #include <epan/packet.h> #include <epan/dissectors/packet-tcp.h> -#include "prefs.h" +#include <epan/prefs.h> #include "packet-opsi.h" diff --git a/plugins/pcli/packet-pcli.c b/plugins/pcli/packet-pcli.c index 2edbbe016e..67d299ab4d 100644 --- a/plugins/pcli/packet-pcli.c +++ b/plugins/pcli/packet-pcli.c @@ -45,7 +45,7 @@ #include <string.h> #include <epan/packet.h> #include <epan/addr_resolv.h> -#include "prefs.h" +#include <epan/prefs.h> #include <epan/strutil.h> #include "plugins/plugin_api_defs.h" diff --git a/plugins/plugin_api.h b/plugins/plugin_api.h index d9e29340ce..574d962083 100644 --- a/plugins/plugin_api.h +++ b/plugins/plugin_api.h @@ -46,7 +46,7 @@ #include <epan/packet.h> #include <epan/conversation.h> #include <epan/report_err.h> -#include "prefs.h" +#include <epan/prefs.h> #include "reassemble.h" #include <epan/dissectors/packet-giop.h> #include <epan/dissectors/packet-tpkt.h> diff --git a/plugins/plugin_api_list.c b/plugins/plugin_api_list.c index 710f390d49..f30b46e796 100644 --- a/plugins/plugin_api_list.c +++ b/plugins/plugin_api_list.c @@ -31,7 +31,7 @@ #include <epan/filesystem.h> #include <epan/report_err.h> #include <epan/except.h> -#include "prefs.h" +#include <epan/prefs.h> #include "reassemble.h" #include <epan/dissectors/packet-giop.h> #include <epan/dissectors/packet-per.h> diff --git a/tethereal.c b/tethereal.c index eefb2778d0..3567ce6876 100644 --- a/tethereal.c +++ b/tethereal.c @@ -83,7 +83,7 @@ #include <epan/packet.h> #include "file.h" #include "disabled_protos.h" -#include "prefs.h" +#include <epan/prefs.h> #include "column.h" #include "print.h" #include <epan/addr_resolv.h> |