aboutsummaryrefslogtreecommitdiffstats
path: root/wireshark-qt.cpp
diff options
context:
space:
mode:
authorDario Lombardo <lomato@gmail.com>2018-01-06 21:39:26 +0100
committerAnders Broman <a.broman58@gmail.com>2018-01-08 05:50:15 +0000
commite80b40adbe823be084fb49cd84336939916120bb (patch)
treed712734b953f7df6f1f79519c7abc73029152e1d /wireshark-qt.cpp
parent6f93baced0fba7d07425e14ea698f4607964c6ed (diff)
extcap: remove conditional compilation.
Change-Id: Ia54bba388755cf27a343fe6d69d244bf1ab897f9 Reviewed-on: https://code.wireshark.org/review/25186 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Roland Knall <rknall@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'wireshark-qt.cpp')
-rw-r--r--wireshark-qt.cpp6
1 files changed, 0 insertions, 6 deletions
diff --git a/wireshark-qt.cpp b/wireshark-qt.cpp
index a890a036f6..0ca3912661 100644
--- a/wireshark-qt.cpp
+++ b/wireshark-qt.cpp
@@ -57,9 +57,7 @@
#include <codecs/codecs.h>
-#ifdef HAVE_EXTCAP
#include <extcap.h>
-#endif
/* general (not Qt specific) */
#include "file.h"
@@ -691,13 +689,11 @@ int main(int argc, char *qt_argv[])
in_file_type = open_info_name_to_type(ex_opt_get_next("read_format"));
}
-#ifdef HAVE_EXTCAP
#ifdef DEBUG_STARTUP_TIME
g_log(LOG_DOMAIN_MAIN, G_LOG_LEVEL_INFO, "Calling extcap_register_preferences, elapsed time %" G_GUINT64_FORMAT " us \n", g_get_monotonic_time() - start_time);
#endif
splash_update(RA_EXTCAP, NULL, NULL);
extcap_register_preferences();
-#endif
splash_update(RA_PREFERENCES, NULL, NULL);
g_log(LOG_DOMAIN_MAIN, G_LOG_LEVEL_INFO, "Calling module preferences, elapsed time %" G_GUINT64_FORMAT " us \n", g_get_monotonic_time() - start_time);
@@ -955,9 +951,7 @@ int main(int argc, char *qt_argv[])
recent_cleanup();
epan_cleanup();
-#ifdef HAVE_EXTCAP
extcap_cleanup();
-#endif
AirPDcapDestroyContext(&airpdcap_ctx);