diff options
| author | Bill Meier <wmeier@newsguy.com> | 2014-12-20 16:23:59 -0500 |
|---|---|---|
| committer | Bill Meier <wmeier@newsguy.com> | 2014-12-21 05:46:22 +0000 |
| commit | b5d7b7ab6e6b0e595d3250d7fa6553d0da79c000 (patch) | |
| tree | 9c89dc59ef32e5b7e1cee654fdf3a30706d7aa11 /epan/dissectors/packet-mtp3.c | |
| parent | 14cff7b6e2865efe7229f9831939fd4d241ca10c (diff) | |
Cleanup use of #includes in non-generated epan/dissector/*.c
Specifically:
- Set packet.h to be the first wireshark #include after
config.h and "system" #includes.
packet.h added as an #include in some cases when missing.
- Remove some #includes included (directly/indirectly) in
packet.h. E.g., glib.h.
(Done only for those files including packet.h).
- As needed, move "system" #includes to be after config.h and
before wireshark #includes.
- Rework various #include file specifications for consistency.
- Misc.
Change-Id: Ifaa1a14b50b69fbad38ea4838a49dfe595c54c95
Reviewed-on: https://code.wireshark.org/review/5923
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Bill Meier <wmeier@newsguy.com>
Diffstat (limited to 'epan/dissectors/packet-mtp3.c')
| -rw-r--r-- | epan/dissectors/packet-mtp3.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/epan/dissectors/packet-mtp3.c b/epan/dissectors/packet-mtp3.c index 8cf850537f..cc2ab94377 100644 --- a/epan/dissectors/packet-mtp3.c +++ b/epan/dissectors/packet-mtp3.c @@ -38,12 +38,9 @@ #include "config.h" #include <string.h> -#include <glib.h> - #include <epan/packet.h> #include <epan/tap.h> #include <epan/prefs.h> -#include <epan/wmem/wmem.h> #include <wiretap/wtap.h> #include "packet-q708.h" @@ -120,7 +117,8 @@ typedef enum { static gint itu_pc_structure = ITU_PC_STRUCTURE_NONE; static gint japan_pc_structure = JAPAN_PC_STRUCTURE_NONE; -#include <packet-mtp3.h> +#include "packet-mtp3.h" + gint mtp3_standard = ITU_STANDARD; gboolean mtp3_heuristic_standard = FALSE; |