From ecb4dc396ef71feb67aeda7603e09b0cea0bc920 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Valverde?= <joao.valverde@tecnico.ulisboa.pt>
Date: Mon, 14 Mar 2016 19:03:11 +0000
Subject: Include ws_diag_control.h in config.h
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: Ia394071710ecda3b0e6686a51fbca45a8ff20317
Reviewed-on: https://code.wireshark.org/review/14749
Petri-Dish: João Valverde <j@v6e.pt>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: João Valverde <j@v6e.pt>
---
 mergecap.c | 1 -
 1 file changed, 1 deletion(-)

(limited to 'mergecap.c')

diff --git a/mergecap.c b/mergecap.c
index 3e93ea592a..76edfa4f63 100644
--- a/mergecap.c
+++ b/mergecap.c
@@ -49,7 +49,6 @@
 #include <wsutil/file_util.h>
 #include <wsutil/privileges.h>
 #include <wsutil/strnatcmp.h>
-#include <wsutil/ws_diag_control.h>
 #include <wsutil/ws_version_info.h>
 
 #ifdef HAVE_PLUGINS
-- 
cgit v1.2.1