Move prefs.c and prefs.h into the epan subdirectory.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@12115 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/Makefile.common b/Makefile.common
index b693cfe77d90b04238b65b7198ade2a63c6568b5..c843593a1a691c57d95ac3721a100fb5fd21a7c2 100644 (file)
--- 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 \

diff --git a/capture.c b/capture.c
index c93b234fb84efa49c92fa1325fdd99077d322e58..e848d29d6d27a2033d1ce92c02641fad223fa716 100644 (file)
--- a/capture.c
+++ b/capture.c
@@ -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 9cfd0b2c551c18e6af5778a70631ef9c50c09366..211346b11286b9320eae4dbf76b90360cdd712d6 100644 (file)
--- 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"
 

diff --git a/column.c b/column.c
index b17cfcd7c0db6ace90071cba1bb7ab2108ede3c1..3a37416390290d4db81e37da5e4f1b8d38f869ff 100644 (file)
--- a/column.c
+++ b/column.c
@@ -40,7 +40,7 @@
 #endif
 
 #include <epan/timestamp.h>
-#include "prefs.h"
+#include <epan/prefs.h>
 #include "column.h"
 #include <epan/packet.h>
 

diff --git a/dftest.c b/dftest.c
index 6c24fb5d1669303764a59db5d6c0f4109a67665f..2eae86cac948b469ed9510cf10f5c5b8fae9fdcb 100644 (file)
--- a/dftest.c
+++ b/dftest.c
@@ -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 c1d723fe060c5790145b1225043eea653c384a55..47579b752004c69af4f2d474b6def8dc4592ab1d 100644 (file)
--- 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 09a6f44564f80dc5d613090df6299e436a3cf869..910bcb92366636844a1b748a1ed3147f8508defb 100644 (file)
--- 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 f7a4ed7e2ecc89eb56a4de37e54041b2bed8b184..75c9652e254c11347b72a54ddca7d2c34e0bfbe9 100644 (file)
--- 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 0d3437f6c9820c2fdf3bec8588544bbbdbb09639..c8988afc7a2cdacea947378acff29e32c860dd1c 100644 (file)
--- 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 60c825a37298a9a7550ac3192eaaf346c8254e71..ecadac346ba73aaa9c587e8632a0e59db0f34290 100644 (file)
--- 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 c3b990fbc7c8358631471b6857c5c73710b048df..552240dae07923cbf88b82a803864b9ece0de72a 100644 (file)
--- 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 3c7f8efc61ad04c9218acb92a24cea75c40bc2d5..66a23f886a6569e910f1ff2300c2110adbfca828 100644 (file)
--- 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 bc4884c05b110427d02a4d91e8d9ae0a66161552..1d16dc539e7c20f7f744bb7db80b76c6d8853ed3 100644 (file)
--- 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 bd340e03585a5ff1f30932abd790a6f3303ac4b6..c37d4f1b8aa73289cb65ff412fbec7f1acf6c51c 100644 (file)
--- 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 ab00645d19f165c9f023d71449f7ffad836017b9..c45f7c0a3682e98f5eba53cb01260e2db5168b65 100644 (file)
--- 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 900290a175a67c55175f6aec3b3ec8cc0ac50f05..896d6e2a01b9c00d4024bc0798e3cb515db0d34e 100644 (file)
--- 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 0f99e50a85468cb0e0d399d1414ce1e9e9029cb4..1dd350108eb1337a3d304925f1631b96d1092bdd 100644 (file)
--- 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 a7d7cb642b58138fd725d325e4750ff10294c90c..5b9e3e60935d79b41da1d6c7d7991c1c91d24d77 100644 (file)
--- 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 c422677a99be51916dde348837a7f66060d7b7b0..9722874054943429bc3676205a22599da60ff020 100644 (file)
--- 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 16a703d1e58f0306490b7d77e37c5345eef9b216..64bd69092eeac117db29dc27f378676662828215 100644 (file)
--- 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 0ca8795d5c0f7d174ad74187f7b3dcdb27e069a3..d58fc7a0ab80572fdcb11fae430a2a993d50885a 100644 (file)
--- 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 9e271fec261d0060c2719242d9f0eed280d2cd30..e081b3845a71ef2133f610c900e5c420a44de4e0 100644 (file)
--- 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 686e769eac8efdc545386fa964dabb1fb64f0ee1..8386dcc7a2066b4ee1752793efab9fe6a4a334a3 100644 (file)
--- 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 a0a5f08c7af60e7535d2256ffe1d956e29baa0a7..9018595a4a18fd09385659fe13a5a335cded445b 100644 (file)
--- 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 e478a255b6d8cbc483ea18ff00968bd2af47649d..f159a1f7b1a3b8a606961f7f5a4156828f26ac70 100644 (file)
--- 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 47c4799c23dc55b458b40507569f9fe4d6405953..d19fbef7576077b485307d7d18400bef28a923f3 100644 (file)
--- 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 a16353ba131f568656947e78bacafa15f9bc0e4f..e3fba3734e15fd59767fa4ce9dfa58d19aa55cdb 100644 (file)
--- 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 8e338b16aa99c73c6fd1e993edf72c980f8f1a06..84edd9ada664bb2a17ef38b19eeb49d5f0f7e713 100644 (file)
--- 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 cf10cbd114147fe3fa689a2504634968d27cecc9..8faf2cc931632b0cd1c93d120a32a73b85e8d950 100644 (file)
--- 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 562783a215b288eb8e347df8a07fe03a870e4ece..a84b6bf06e74f8ca63601afdfadcaff30966ec3b 100644 (file)
--- 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 114707bd7e1f00d663242dfdd4bb2f1183a9e873..2bf7449b2395052dfb74a8a916a7a5365e30d9c5 100644 (file)
--- 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 7e58442869b87d642e7283346d78cee040fc6bd0..eecd46cdc83b83ca6c153d4795b93157e835d5df 100644 (file)
--- 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 fcb87cc4bbc1cb04c61b662fa60e4652919c3ff9..2c4a67a2bffd636eb24be14acc28b14b97fd84cb 100644 (file)
--- 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 6c985e1928ca72c6aeef85253351ed7792b8efcc..e82eba3a46b426ff8ff3f45ce6f379e5a9f6bfa6 100644 (file)
--- 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 5ec6b049930129b913abdc6355d9bb6138958575..c8e1d5839a76b47c2a1fcc0546049af4795476f6 100644 (file)
--- 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 4f823018bd15739a5d45ec3381ea067e2149b687..8285b6072e079a39ada0452d8d9be6ea92e84fec 100644 (file)
--- 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 98250526ee56b1626591e7429343a0b4f71013bc..ffd364a02d491f19bfd49adf78770a13b9472966 100644 (file)
--- 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 b1171e9e9b22dc0632b3f5b03ce71bcda498a9c8..c87307587f27e3c5cfbe5cea32b740378d0581a3 100644 (file)
--- 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 84460e067789ea971eadd4467783bc3c3057a9db..3dd975cfedea1dc163fbf49172d2b150687712a5 100644 (file)
--- 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 df87eea14ae4781942e42abeb1df167bf1b179b7..61fb79a23c6be67e6765c8da9217d7a8b840decd 100644 (file)
--- 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 9f7cae488b79ab05ebb3fc5cf78d49c7141c57cd..b9ca93c5087c860332683e8b2e9dd61d0845d18e 100644 (file)
--- 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 bb99dd18dcef2bf0c8cf5c044969b18484fa3492..619c1bb1e179f74397d26a957a14ea7b4beb69e2 100644 (file)
--- 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 5d53b752ef45ccc2a9717d071d1f6b3de8399132..45221d7b5a8a658792debf5887513c2135f4a485 100644 (file)
--- 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 504c7fc0100f5660b572e4719d0b405c83dac5ed..0dcad5b0b05abdcd8827813e3257403174cd13bb 100644 (file)
--- 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 d1c35aa67a3f0510642b8d4d0b6c06e1a70aa8ac..12d2422833c646caf31c894ab6ba7392b16967c9 100644 (file)
--- 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 c3d2f434f7e2bf79edfd64fb8a2caf2126b865e7..7ee33fd642e3fc8e3264b6285f96db3aef6f2b1f 100644 (file)
--- 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 2ae4cb7bd1ef8558465504bf92c7517106006cff..ea056fb9de613302e9c3e402168196a90c809b0d 100644 (file)
--- 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 fb9ae7b639a71fb00b619df695a7107f811da2ed..542207d213ba27c36144e1bda94a0aee6fb45de4 100644 (file)
--- 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 58fa038fd7c2a5c72f98171577f120e32bb40399..03603367399f4c7887de06a51b9be80ff95938b6 100644 (file)
--- 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 a745f1460c18c334928bc9bdd48d55e9ac3a912f..590a93a3c7f86928f015aa245a9594ef64655634 100644 (file)
--- 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 13b9dbb98307b233095bc2eeb1fdd2f9c2a31307..8653bffd445fb8c0f483af838a5d31e925a762ce 100644 (file)
--- 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 fffbd98cdae6faa9bdc897cd67a8c02136ef4cf2..97f0d0de9ae237a13bb84aff3ebcd6858788277a 100644 (file)
--- 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 996edf0476516e95cb9b5a2a34ebe65611a34fe8..7d502d2c9bef44af3fd14e9c1f839e70e908a8ef 100644 (file)
--- 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 32d58a9e0d0c534ee04f785ffded8100018db678..edfd8edfef4ad4e6f2a2bf3690db143916c4334d 100644 (file)
--- 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 bb4a45090b075e40a5e55915778b1e26fca37527..0bdef0c3c8856cc125e0cd22dfa7eea001b494ca 100644 (file)
--- 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 43cc523ab5b0f1304d90cafb0911e715e5d4b76b..7f91eb09ab9bb2f2ec0fe70121e689835263696c 100644 (file)
--- 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 76defcd5bfeca3ed5c80c7aea773f4b579b4307a..673affdb54a16e21428d43ee35769a421033ea26 100644 (file)
--- 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 a22167cc80b6659cf41a749ce4f7a9b67cf20eb5..edd485e0cbd722b899000cae192ad673cda21b64 100644 (file)
--- 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 afebdb97f098bd64a76070fabde556471c346e8e..5a3d224387672de7bbe2d836c07ba77885ac5774 100644 (file)
--- 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 5c6841f5173631a581a08dadfa1f419bb1400138..e8a38af72163e531b1c24996acaf6419c6d91c79 100644 (file)
--- 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 516961cd71088253976d0739eadfcfd5f5ba250a..c4224cfe47ee2bf23d4b826a4f0e6ee864025081 100644 (file)
--- 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 00770da3e901a8f475008605b729ba207b1f4009..64316338cd162ab2b7e013821a4c676443f4f593 100644 (file)
--- 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 efd396bca81cbb68987b45a1f0208fcc0c0d979f..a48bb11a65b1027e40e161258a44a1008bb1ff97 100644 (file)
--- 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 512e11298dacf871ac0389a284d7d76f13ab2055..c1d2a41d3c608fd4047ade5caeff622a101edea3 100644 (file)
--- 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 0efe18f511cb4fb349d493b56eb0bc6c6dc94ab9..476e21d7d650ceb730db72d89c131ee7935bf7ef 100644 (file)
--- 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 ecacef6657ebc2a60dda16c6dcceba908d328b38..7c1586fa9ca2da13f88fe217181a123e40015553 100644 (file)
--- 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 cad7694900dbfd1aa029e92d572809eeb4e99d66..f2d87cd9334c5f3cb63a3afb453bf374f875bd54 100644 (file)
--- 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 daeee925ef81d092e124f5bb6d69746703403fdc..f12f875f424cf0ac3a580ebf81ce3e9492d427c0 100644 (file)
--- 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 48ab05a04729867add6e60516cc45b7bf94f6600..cea32ec0a60c4b5f5473164e97655657c03b3fff 100644 (file)
--- 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 407a394bc26c042c1e45862eb86acbaef69fd6c0..6a205fa725759035d06541a6785160b82ae17806 100644 (file)
--- 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 b99f0b1a6c26c0544c298067b021469b288d7bb5..794ee6f3722b45db8da42e153bbdc514115de65d 100644 (file)
--- 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 2dde42f368fc90a15229c182b5caf13c8a6abcd3..86e6936678586c1789b54b825393ec627ae6dc25 100644 (file)
--- 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 decd20987f020f37dc7a70599c813f29d630601b..e88aef39ae06d9fbacc57543a14f0598f5ec806a 100644 (file)
--- 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 237d15b49e819e5178d84c81e153f6012258d123..975f28687203bb58b9725d85aa4773caf83d5335 100644 (file)
--- 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 d5f628ada5e5be1f682aac1aa22b04789f7680fd..86f2fb542a8e8b7f5b0524cc98faf2e05c7f04b4 100644 (file)
--- 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 7bc8e4f39b2281dce98bc386d94c79d3ca53783c..0d1d4b55b43516132b87c841cf16015b52f2a444 100644 (file)
--- 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 55942c4ba46155860653f598268c5321018c1e85..51321ebb8871ad1a85afb7eb11e0c74d2016c2b4 100644 (file)
--- 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 8f74533cf6f94b94446769a2a8f758f580aaf460..b148dd24af25dec48e7e81ffb3803fb344d9686e 100644 (file)
--- 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 d938fb0aed99b4a4441d500180c8d7d332418b9b..c78e535e116daf65199de9bffc33931611d276a4 100644 (file)
--- 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 65517acbbc49a19579d5992a9f3ac286181c3d6b..9fb4870b8fc089b34be0eb93ad3585886dd88c18 100644 (file)
--- 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 c37046899b4bc2c2b3ce486f2591e76da9905217..0bf817fe49572e9c75e90de1ac1a29537371a12e 100644 (file)
--- 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 52b5826c83be7e575ba6e061b84fedb8c43fdbd5..eb16e496bac149df6c55c40c41097c04185e15ad 100644 (file)
--- 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 6ab3644735db6170bcfb6b706c4287bf78993bfa..67a21fe96c48e6e81fe429cc730470d378bf4819 100644 (file)
--- 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 ed1081d34fbc85ce66633f8f2809d2749eaeabc6..364ca9faa51ebbf478ba17aeadedec2bf764e645 100644 (file)
--- 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 b07501054e09333c805edb196c5add8a426ab0bd..0d961a1462296918768327176c778d5bf814c4e5 100644 (file)
--- 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 8cf3c0bf3d131e3b6aa49496d86b535c24a89954..1fe997a6cf3ac9336d77a4a3a14955d6cd12e5f2 100644 (file)
--- 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 7aa352c082e13572c2ab80a7f0242ab8ec4ca0fe..24b35f5426c10b16e2a83d99d5405b6617a3d42d 100644 (file)
--- 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 0d631aaf12f6db66626f8245846898c1eaf33c6d..d3067a26a16743707e9e725d78453cc978040a33 100644 (file)
--- 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 cf0dc20af67708b05c83a465a311f98c116abc88..9aa6789953a8593b6611414e9ad7dc6704886f97 100644 (file)
--- 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 a18355ee4a2fe8c14c14e3ae397b574a8855cb37..2b8e5df412480361ab57cfeb11cbe365bd8bd31f 100644 (file)
--- 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 8efe72c7d646f2edbee5edee96524cd5821f95ff..d37f1c6b2acb48e2cde703a7f0f59696e7c1b934 100644 (file)
--- 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 66962677a8c117ac436dd1e7daeda63c4323bdd7..8216c9f9ab42417931c4cdb8d70ef50a664e0bb4 100644 (file)
--- 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 61b421e2852ac7f26ca43a2d544f68808ad4b391..e45e9719d4b9090532624bffb55a430dd948b8d6 100644 (file)
--- 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 1c0715de4911960efe7d09cfbe2f82d4101ec60d..fd8408027bdfd7bb25d73a0f5bb43c0bc27233fc 100644 (file)
--- 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 752a19b7b897f43e56fb51a24be82c353ac24bcf..f9a47237043e92a0bf3acccee1602c5dcf57b7e3 100644 (file)
--- 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 188077e3e4f3e4f9f7476bd991115661916aa3cd..24e3ecb0cd755c2ed75f8c49b4fc076a78875b59 100644 (file)
--- 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 4bfa93e88fd873f5cd19d669676bec968e7b6702..85ae3aeee6964903be011433ab54cfd4ac662bc8 100644 (file)
--- 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 5af335a52afe0d565c71af66150190a716b3670e..dea5e991ceeb1d9ef4ed272f64c968564f9dd479 100644 (file)
--- 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 294da2e1bf93b17473ff671f6c229e0dffe0f00b..be0f49d2467d3abcd4c60e5ddfb6dd9af10ef8bb 100644 (file)
--- 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 77939b5cf7cb10843fa8be8c4cab80d9cf24a9a9..0fa9207dfad1e8c9f01d86445602e84d4fac9f0c 100644 (file)
--- 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 c6b1774569df5a6bd15c0ede17b60921d2056502..a904ad38b6c30109295bb74e6519625d784085ba 100644 (file)
--- 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 b69f8db6ee16b098790374cff792b928592d0b07..3fe9210cc7dbb1ba466d047832f6cc8126942861 100644 (file)
--- 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 408be00024209ef7204c37f72b6e662b94636f68..d29a4b6a77389e8acd1d795510fd99f0da59dd45 100644 (file)
--- 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 13630e462acdeac66113ee9f49b1d7741697001a..2cb137b39950bc449c63baf1e5a68bb5c52be17a 100644 (file)
--- 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 423e0ca026a9a285dfdb3c9f9a2d301d4f9ad2e0..c6952c586538a4952382045a57a7650ee13f6a68 100644 (file)
--- 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 9ef6c856ea0aa2df975b1207416e052050ec87ba..108d10e90aed8582ee7afda20858b8befd10fe27 100644 (file)
--- 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 62833797cbe70410daca2717dc5a48d74fb39bc5..212deeed72ed5768d53bd4fcdbccda5c87cfc2b5 100644 (file)
--- 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 370be66c0c5f62f4243864e732bf5d2e71e83274..5a866f6cdfb4cc7fc84fcab085eb401aae4e689b 100644 (file)
--- 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 c59692d9a6c8fe9de4646698f68c4a62ffe818b2..ba959a002b53228f1d901dad6a04d2c10f19837b 100644 (file)
--- 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 6f7960d0fadd021238cb408e8f8f3b9682acee46..b7e792769aa38a086a79677ff8f6a6b11680c64a 100644 (file)
--- 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 19f0edcd8341da9a73f7c5e7f47577b07ae348c2..f69beff82e9de6d506f22233dc5bebc6689ea1c2 100644 (file)
--- 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 3cb5e1ef015a5c6e07d692aac951864d11a77fd4..9fd487f1d93825ff57dc9579185400b9425b8eb4 100644 (file)
--- 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 c1ef7fade1fa72813839c7060e6acdd5debae9d4..89cdbc76260f828df37374137326d7282d0659e2 100644 (file)
--- 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 ad1b55d9cb7c617c1324669ba59e0b62fd18f343..4d4efc4428ab1d5c916545f8199af985e8d07b4d 100644 (file)
--- 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 96f86b2a8ce6d24e1b1646b1877743267a409e37..5626603cb3fc4b5e12322c82dadc609d3de3f265 100644 (file)
--- 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 0a4161b805f7b995a18a97364b082c0814576e63..26b56425858e596511303ee1260372b366460a62 100644 (file)
--- 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 be120665001908ca53e031e25d0e95476d477fae..a2de5f0c9dda84d01237b5db0585087708da575a 100644 (file)
--- 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 5890d65262c75fd06a40b2a05827c6ed754af76b..9fc9603edb4e80f69cb8e730d7fd85089abc6e93 100644 (file)
--- 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 677ae4dfd28f7c609c18a0de3755c46d7fda4200..4a3965a85ac1181e3a9c31ef6bd5460a503221d8 100644 (file)
--- 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 fea2c4c7f6fcece44834538c8ad42565157084af..afe99bfdb358583b043ad38d2361f7021056cfab 100644 (file)
--- 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 401b6bcac2570293434cf33b3428d9b3a1d4b991..682a6683b1521233eff8b5b3842b66b80af90f50 100644 (file)
--- 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 495c335aaf277a6da38e3a9de5f10be8dba57847..3089f94b66f9d7297864fbf3f7fdf12239275252 100644 (file)
--- 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 cd90c4e390b5f98cc36308bf30161db6661fcc5d..19380240284b96f0ba9276334782bd48b6781c43 100644 (file)
--- 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 a5f02776ccf286d3a36180d49e5d7966aa766a4a..160ae00e51904c5d56619999356aa73df211d593 100644 (file)
--- 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 8968beb5a5ac04a20a1d80d2cb4f239805aa7bd2..6a3bcac406be8e20147b644c98a66ce65f9670db 100644 (file)
--- 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 0a080820fa1aa63e25ac6a2028d3fc754aba0616..07b535d14844a34c08e673bd1f8d225b5fdab4ae 100644 (file)
--- 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 e5e3e42ee5fe0f5af3fd92178f3ff6d5e2cc1c46..5941e33e3cca4aaee786ee2047995d55dd7e4686 100644 (file)
--- 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 2c02103244a5907ad2a89489891dd6ba337dfea2..4dbd0a1e414f9cb366ca7e10e87719205848b7b6 100644 (file)
--- 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 27f4cd32d045a7a70472cb84fc1072e771bd3f6d..3fd2c1826a6be2e12a06d86eb8edfeec1b01f6f4 100644 (file)
--- 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 b9a10f6ae980337070a3cc453f31b8db579084b5..052f97048943fb1a619869af26c4c437cfe1d791 100644 (file)
--- 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 b42e75ca516716337d8bb4fcd9a07f78d748c81a..c54ea8747da0ad7363a4b47186d08d777ce1d9f4 100644 (file)
--- 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 1841b4ef37036006c5b60be2b69dc2c532f76191..c3dfee4d80edb8624b0711ef89d824552b5b91eb 100644 (file)
--- 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 79d1130a6a08a6bfa980766d9c5549d6c28c134f..d47c12e385b4be3223b1ff7bd8db221c862c5ff2 100644 (file)
--- 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 89b7b51618fcec9fc05e1cec2e3dd95455e7f95c..b2a0cfe565c3d5777e53a41fc6ee9a4860a95e48 100644 (file)
--- 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 30bbe0cbcaef35ded7758209a773842312a34eba..309d53726fab4b77dbd89bb1528a827fdb636e0c 100644 (file)
--- 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 2ebba21fe4aee95fa3eb6e79578a89567fbbf813..15b8473000c53193bd745edc376a67fd8a0bbee2 100644 (file)
--- 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 9a723d4c41ce11c5da68f108ef31776c72a145d5..3bfd6d72ef717e978be7e2db7c867eaf4319cdef 100644 (file)
--- 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 653b5049c1df1d998ec571da270cfcf692c14987..fb2427f07d4efa6708dc7767b960455d45d4a910 100644 (file)
--- 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 18bb79ceb0b10e2d329d1b4ebf42334287fe23c7..b29b07cb9a63d7d1fb6cc405b13ed32a758813be 100644 (file)
--- 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 29dd3e22f99e9c5082ab5a62a710dc6027ad13d1..55100f084e093b0daeabed8350b9eb191a18b2a8 100644 (file)
--- 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 6459fab9faab819997bcf7aa88c2b00ceb413839..b60eba9ff70614189b1c95049f09c4df0514e943 100644 (file)
--- 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
similarity index 99%
rename from prefs.c
rename to epan/prefs.c
index bafa935e7c592d9fe1e412bf4c5e51e04ad70f78..67832e172e3c7f66f3245d91a88481453a8f6d45 100644 (file)
--- 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
similarity index 100%
rename from prefs.h
rename to epan/prefs.h

diff --git a/file.c b/file.c
index 4fccc4c45fd4df817da0956391bbf967bd4c15dd..7dd9643e37114b66c9267e0325bb3be344726183 100644 (file)
--- a/file.c
+++ b/file.c
@@ -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 f4447fc5a724a1cef302c5b52fae911a3d8001d2..3f5150a0f9bffe7b577e8ecfc2291a2dcbf201ca 100644 (file)
--- 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 7207f1113ffe0a522346896a7fca6a2c59a9f490..b479380346ff9ce75127bd518ac59090b867f29b 100644 (file)
--- 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 1a45a943dfedc86534257a4c7e1b65709fb4d041..5ae6f19567e3890105cfcc84cb0ccbea95e317f4 100644 (file)
--- 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 64c22abfc35adfc0a88219d6cb1d096b9fbd9ef9..7c4370636fea3bbe12fa1ff286c3482ecef44a55 100644 (file)
--- 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 d93f402652c9cb69b3f4c8e793bb95b78c516995..565754d722102f95611b5b80fd4bd008731dcd47 100644 (file)
--- 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 80810f7fd43d4951ebe0ce7c7437e3b3f42f57cd..ac9695d589533d959bffb6abd300f0e5a59c445a 100644 (file)
--- 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 684be41d8da4700e38280e1e47e4405f4bb497b6..f7208fc48edbd96d52d539beea1a6de1d920b251 100644 (file)
--- 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 056e2d67017976aed818a94f784bf5fd83e9a0ab..37f2cbdf375bb135c3e6327dff5d822e06aade7b 100644 (file)
--- 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 2b4d5855d777d38cccc2aa5dfd973bec5977dd77..dcb42ef402628e461607ba553114dfe7da28952b 100644 (file)
--- 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 7d1bdc4aac13042d6990ef8786b04c52f27a9ba8..4b957d9afb65c69a3d113124ae92467b520f9d8e 100644 (file)
--- 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 36d1edfe7e98ce94abfcd40975f00325be24fa36..b198df8a5c0dfae1e5ec798e199ddd2febe772d3 100644 (file)
--- 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 0bc5e720e16ec64618a4d7a8c34ed76428fd7f63..b4771686e7ee0b5427e5689fa587a09806eed48d 100644 (file)
--- 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 7f5726c982869cd3a61ecb6b2876a0c402832b7a..4bcd04647d5a577d931844814c758e1f0779e756 100644 (file)
--- 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 04955ae56e40fe4df7e5e4bb2bf2fbb8a1d987d2..f3fb415b2dd29af166655de7c22aceecd2512395 100644 (file)
--- 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 46e63b95a4a6a424078af2d6737db45f9a5ef06a..93ffb4c12fc6bbe092c9e51d3ba6878051bb586b 100644 (file)
--- 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 38eb1d493c76975e7ae87769cb8c6b0ad92f6fb8..dbe3946cf847f0e0823c411bba516bcdf08484f3 100644 (file)
--- 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 9c5b4db37f8a446a1b9f4899e225b6cd5c8940ad..63c48915bc91f217ffd35a9b8afec6b8717283dd 100644 (file)
--- 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 aa8531c7de125c3b01c2599cbd1c28009efa6014..d73bc57c6d8cff0e1fc2986f9b1e23fd0068e2d4 100644 (file)
--- 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 c536dbd20e1b0548d774f0c6ba9cfb9a93aa55d2..a55614b82a3ecdf600f6dca04f55100b80238cd5 100644 (file)
--- 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 cf7580fbe56410edc89113d90548ad4ee9ee940d..5204ea54664478dc94bb4946ccba596fe77e487c 100644 (file)
--- 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 d017ec24f7eabccf40123d766c97361ca992f278..b2ddfb9a6c806bc4c5c93e0d237f7afbe8c6f207 100644 (file)
--- 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 de5742e116fc8a6763da08ca8c4c4749f9a5936b..de198e8a6f1d3248481079422d6059d93f0a426f 100644 (file)
--- 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 ebf80dfd0ee25e62f0445be895fb318cb35c59a3..d18b2a406ff0ab3a2de6cf44bcafa0394d505afa 100644 (file)
--- 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 046528eeafc0e3d2c93d33fb69eddbdf89e7a38d..53bc1486e0a40dfc5888707b5fbccc0528bce573 100644 (file)
--- 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 bd3a4dc95ea839c314f4f2d3a391c16b22565bbc..31625aa43f78bb1900af90ede557303591f47f19 100644 (file)
--- 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 9c4e5bf11f20fd19faa0a1f1c8ba766a0ae62982..97ab2dbc9c601222d2cfa0acf4afce510f0ba92e 100644 (file)
--- 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 e9d28c15847c1fdfcee24b2e6fe366b7dbe167ef..a483fce19f5c4e80af7e916904554796a221a129 100644 (file)
--- 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 d328f79c84dfd74a1efd9f8a77c9a30c54d6e046..52ee837ca580fa265bf0aaa2c41179015167928f 100644 (file)
--- 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 9130703e59147b12f695c68d1978a0c73ba4e3e0..f2c4ee174fd4c5a0a607ff2c6fc7e3758bc5670a 100644 (file)
--- 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 d78315d233944dfc682c7b6a29cbcf90cd62b85b..5edd07fdc2c2b364221cf604e263f44bd30b9d75 100644 (file)
--- 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 aed64e4c6c3f078d2606461f72d544b71aa5f1ca..ae54f1a76942fc9fe715fe5f0c84a98aef0f2f95 100644 (file)
--- 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 3d56f5e2d2ba011eb3cc204aa129186871417ed9..dbfef47deb0b1ffece9fafe4b9add059f284f044 100644 (file)
--- 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 a69441dfbb2e634cdf7713be38f087ae4be55951..1329ad94937e511d595bcd56fd865950308d9cfd 100644 (file)
--- 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 a8ab911bd8d405305c1ce631ade70b99d39e4941..fc5a642bbfa2638d40dd79ace8245270b3030c4f 100644 (file)
--- 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 2c163d368fba563e2d5058ac44d5c63debbc74be..1efdd2df54022d3c9458feece8c7e317300c976b 100644 (file)
--- 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 2dc26cb3c41dde941df583ac35ab37effeea9c5b..546eded413987ce1d94dc0eba46279dd50e845bf 100644 (file)
--- 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 2edbbe016efba5f25c9f28e7ef45d36e79a1e767..67d299ab4db8accfa2ddf9b4873db076e3ba05a1 100644 (file)
--- 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 d9e29340ced47e6769107a7b7178d2c776b6e85d..574d962083b33a375db10255311924970a3f2f3e 100644 (file)
--- 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 710f390d49bc32605d536d9e07530e7ecdd713c3..f30b46e79667e59292ea35af52c431c8308edbd5 100644 (file)
--- 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 eefb2778d01332d8c9405f0829ce1f8adb402fdb..3567ce6876aadfec66da30b51d12514b190981d5 100644 (file)
--- 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>