summaryrefslogtreecommitdiff
path: root/wiretap/merge.c
diff options
context:
space:
mode:
authorMartin Mathieson <martin.r.mathieson@googlemail.com>2015-01-02 23:28:44 +0000
committerMartin Mathieson <martin.r.mathieson@googlemail.com>2015-01-03 21:06:36 +0000
commita190c936d754f553e218de7174223b12c49b6b3e (patch)
tree3e654ee5dfd0c6125a3de7985118c191331b7b81 /wiretap/merge.c
parent1f3849ce614aeae5fda742beffe5558e7c2a8b71 (diff)
downloadwireshark-a190c936d754f553e218de7174223b12c49b6b3e.tar.gz
Remove unnecessary includes from wiretap folder
Change-Id: I10d3057801673bc1c8ea78f144215869cc4b1851 Reviewed-on: https://code.wireshark.org/review/6217 Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com> Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
Diffstat (limited to 'wiretap/merge.c')
-rw-r--r--wiretap/merge.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/wiretap/merge.c b/wiretap/merge.c
index 3b320fa53b..4bd2394c35 100644
--- a/wiretap/merge.c
+++ b/wiretap/merge.c
@@ -26,9 +26,7 @@
#include "config.h"
-#include <stdio.h>
#include <stdlib.h>
-#include <glib.h>
#include <errno.h>
#ifdef HAVE_UNISTD_H