aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/asn1
diff options
context:
space:
mode:
authorJaap Keuter <jaap.keuter@xs4all.nl>2020-04-22 15:36:25 +0200
committerPeter Wu <peter@lekensteyn.nl>2020-05-01 21:28:27 +0000
commitd5fc969e578a1e3a3eccb03b1586cbadd58107a5 (patch)
tree2bc32880062592e12c0cd015745769a7dcfc3753 /epan/dissectors/asn1
parentf35865428b3a14d8aac47db78e2f59c5b1f1df53 (diff)
No explicit glib.h include required
Stop including glib.h in dissectors, this will come in implicitly with packet.h including proto.h, an essential include file for dissectors. While at it, config.h is no longer conditional and stdio.h is usually not needed either. Some other cleanups too. Change-Id: I60c12f16d7ef1e6398509293031ffed7460d2c61 Reviewed-on: https://code.wireshark.org/review/36969 Reviewed-by: Orgad Shaneh <orgads@gmail.com> Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Diffstat (limited to 'epan/dissectors/asn1')
-rw-r--r--epan/dissectors/asn1/lnpdqp/packet-lnpdqp-template.c1
-rw-r--r--epan/dissectors/asn1/mms/packet-mms-template.c3
-rw-r--r--epan/dissectors/asn1/z3950/packet-z3950-template.c6
3 files changed, 1 insertions, 9 deletions
diff --git a/epan/dissectors/asn1/lnpdqp/packet-lnpdqp-template.c b/epan/dissectors/asn1/lnpdqp/packet-lnpdqp-template.c
index 3f1aafef34..60feddf6f5 100644
--- a/epan/dissectors/asn1/lnpdqp/packet-lnpdqp-template.c
+++ b/epan/dissectors/asn1/lnpdqp/packet-lnpdqp-template.c
@@ -8,7 +8,6 @@
#include "config.h"
-#include <glib.h>
#include <epan/packet.h>
#include <epan/asn1.h>
diff --git a/epan/dissectors/asn1/mms/packet-mms-template.c b/epan/dissectors/asn1/mms/packet-mms-template.c
index 879e5ae521..36b05820d3 100644
--- a/epan/dissectors/asn1/mms/packet-mms-template.c
+++ b/epan/dissectors/asn1/mms/packet-mms-template.c
@@ -11,9 +11,6 @@
#include "config.h"
-#include <glib.h>
-#include <stdio.h>
-
#include <epan/packet.h>
#include <epan/prefs.h>
#include <epan/asn1.h>
diff --git a/epan/dissectors/asn1/z3950/packet-z3950-template.c b/epan/dissectors/asn1/z3950/packet-z3950-template.c
index 73ff59161d..682edcd01b 100644
--- a/epan/dissectors/asn1/z3950/packet-z3950-template.c
+++ b/epan/dissectors/asn1/z3950/packet-z3950-template.c
@@ -26,11 +26,8 @@
*
*/
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
-#include <glib.h>
#include <epan/packet.h>
#include <epan/conversation.h>
#include <epan/exceptions.h>
@@ -39,7 +36,6 @@
#include <epan/proto_data.h>
#include <wsutil/str_util.h>
-#include <stdio.h>
#include <string.h>
#include "packet-ber.h"