diff options
| author | João Valverde <j@v6e.pt> | 2021-07-12 21:21:51 +0100 |
|---|---|---|
| committer | Wireshark GitLab Utility <gerald+gitlab-utility@wireshark.org> | 2021-07-26 14:56:11 +0000 |
| commit | 8310665ae707b589e04167ef9bd2aed6f71651f3 (patch) | |
| tree | d9d780fca2d1ba23c60aa30e0dceb91dc83c49e3 | |
| parent | 6a619212c325b1ba619562e2b09c3d4f93603809 (diff) | |
| download | wireshark-8310665ae707b589e04167ef9bd2aed6f71651f3.tar.gz wireshark-8310665ae707b589e04167ef9bd2aed6f71651f3.tar.bz2 wireshark-8310665ae707b589e04167ef9bd2aed6f71651f3.zip | |
Normalize some dissector includes
| -rw-r--r-- | epan/dissectors/packet-cip.c | 2 | ||||
| -rw-r--r-- | epan/dissectors/packet-hpfeeds.c | 2 | ||||
| -rw-r--r-- | epan/dissectors/packet-isobus.c | 2 | ||||
| -rw-r--r-- | epan/dissectors/packet-ndps.c | 2 | ||||
| -rw-r--r-- | epan/dissectors/packet-tcp.h | 1 | ||||
| -rw-r--r-- | epan/dissectors/packet-tpm20.c | 2 |
6 files changed, 5 insertions, 6 deletions
diff --git a/epan/dissectors/packet-cip.c b/epan/dissectors/packet-cip.c index ac1dc7705f..0659c0ba4f 100644 --- a/epan/dissectors/packet-cip.c +++ b/epan/dissectors/packet-cip.c @@ -39,7 +39,7 @@ #include <epan/expert.h> #include <epan/prefs.h> #include <epan/proto_data.h> -#include <wmem/wmem_list.h> +#include <epan/wmem/wmem.h> #include "packet-cip.h" #include "packet-cipmotion.h" #include "packet-cipsafety.h" diff --git a/epan/dissectors/packet-hpfeeds.c b/epan/dissectors/packet-hpfeeds.c index 41cdadf8d0..47a269829c 100644 --- a/epan/dissectors/packet-hpfeeds.c +++ b/epan/dissectors/packet-hpfeeds.c @@ -22,7 +22,7 @@ #include <epan/expert.h> #include <epan/tap.h> #include <epan/stats_tree.h> -#include <epan/wmem/wmem_list.h> +#include <epan/wmem/wmem.h> #include "packet-tcp.h" diff --git a/epan/dissectors/packet-isobus.c b/epan/dissectors/packet-isobus.c index f9026d6ef8..6df5499928 100644 --- a/epan/dissectors/packet-isobus.c +++ b/epan/dissectors/packet-isobus.c @@ -15,7 +15,7 @@ #include <epan/packet.h> #include <epan/reassemble.h> #include <epan/dissectors/packet-socketcan.h> -#include <epan/wmem/wmem_map.h> +#include <epan/wmem/wmem.h> void proto_register_isobus(void); void proto_reg_handoff_isobus(void); diff --git a/epan/dissectors/packet-ndps.c b/epan/dissectors/packet-ndps.c index 44c09d08b6..3d65c3ea14 100644 --- a/epan/dissectors/packet-ndps.c +++ b/epan/dissectors/packet-ndps.c @@ -19,7 +19,7 @@ #include <epan/expert.h> #include <epan/strutil.h> #include <epan/proto_data.h> -#include <wmem/wmem_map.h> +#include <epan/wmem/wmem.h> #include "packet-ipx.h" #include "packet-tcp.h" diff --git a/epan/dissectors/packet-tcp.h b/epan/dissectors/packet-tcp.h index 68ca6d0fef..5c7364ad4b 100644 --- a/epan/dissectors/packet-tcp.h +++ b/epan/dissectors/packet-tcp.h @@ -14,7 +14,6 @@ #include <epan/conversation.h> #include <epan/wmem/wmem.h> -#include <epan/wmem/wmem_interval_tree.h> #ifdef __cplusplus extern "C" { diff --git a/epan/dissectors/packet-tpm20.c b/epan/dissectors/packet-tpm20.c index 4b943f474c..9a55101211 100644 --- a/epan/dissectors/packet-tpm20.c +++ b/epan/dissectors/packet-tpm20.c @@ -15,7 +15,7 @@ #include <epan/to_str.h> #include <epan/tvbuff.h> #include <epan/expert.h> -#include <epan/wmem/wmem_tree.h> +#include <epan/wmem/wmem.h> typedef struct { guint32 com_pnum; |