diff options
| author | Dario Lombardo <lomato@gmail.com> | 2018-01-06 21:39:26 +0100 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2018-01-08 05:50:15 +0000 |
| commit | e80b40adbe823be084fb49cd84336939916120bb (patch) | |
| tree | d712734b953f7df6f1f79519c7abc73029152e1d /caputils | |
| parent | 6f93baced0fba7d07425e14ea698f4607964c6ed (diff) | |
| download | wireshark-e80b40adbe823be084fb49cd84336939916120bb.tar.gz wireshark-e80b40adbe823be084fb49cd84336939916120bb.tar.bz2 wireshark-e80b40adbe823be084fb49cd84336939916120bb.zip | |
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 'caputils')
| -rw-r--r-- | caputils/capture-pcap-util.c | 5 | ||||
| -rw-r--r-- | caputils/capture_ifinfo.h | 4 |
2 files changed, 0 insertions, 9 deletions
diff --git a/caputils/capture-pcap-util.c b/caputils/capture-pcap-util.c index 48d596f8ba..300f6e538b 100644 --- a/caputils/capture-pcap-util.c +++ b/caputils/capture-pcap-util.c @@ -288,9 +288,7 @@ if_info_new(const char *name, const char *description, gboolean loopback) if_info->friendly_name = NULL; /* default - unknown */ if_info->vendor_description = NULL; if_info->type = IF_WIRED; /* default */ -#ifdef HAVE_EXTCAP if_info->extcap = g_strdup(""); -#endif #ifdef _WIN32 /* * Get the interface type. @@ -555,10 +553,7 @@ free_if_cb(gpointer data, gpointer user_data _U_) g_free(if_info->name); g_free(if_info->friendly_name); g_free(if_info->vendor_description); -#ifdef HAVE_EXTCAP g_free(if_info->extcap); -#endif - g_slist_foreach(if_info->addrs, free_if_info_addr_cb, NULL); g_slist_free(if_info->addrs); g_free(if_info); diff --git a/caputils/capture_ifinfo.h b/caputils/capture_ifinfo.h index 65084b8d60..e9ffdf483b 100644 --- a/caputils/capture_ifinfo.h +++ b/caputils/capture_ifinfo.h @@ -38,9 +38,7 @@ typedef enum { IF_WIRELESS, IF_DIALUP, IF_USB, -#ifdef HAVE_EXTCAP IF_EXTCAP, -#endif IF_VIRTUAL } interface_type; @@ -59,9 +57,7 @@ typedef struct { GSList *addrs; /* containing address values of if_addr_t */ interface_type type; /* type of interface */ gboolean loopback; /* TRUE if loopback, FALSE otherwise */ -#ifdef HAVE_EXTCAP char *extcap; /* extcap arguments, which present the data to call the extcap interface */ -#endif } if_info_t; /* |