forked from osmocom/wireshark
Windows: Fix build
For some reason this was not caught by the CI.
This commit is contained in:
parent
e2fab18853
commit
ac6cbbcda3
|
@ -1192,28 +1192,27 @@ int load_airpcap(void)
|
|||
* Append the version of AirPcap with which we were compiled to a GString.
|
||||
*/
|
||||
void
|
||||
get_compiled_airpcap_version(GString *str)
|
||||
gather_airpcap_compile_info(feature_list l)
|
||||
{
|
||||
g_string_append(str, "with AirPcap");
|
||||
with_feature(l, "AirPcap");
|
||||
}
|
||||
|
||||
/*
|
||||
* Append the version of AirPcap with which we're running to a GString.
|
||||
*/
|
||||
void
|
||||
get_runtime_airpcap_version(GString *str)
|
||||
gather_airpcap_runtime_info(feature_list l)
|
||||
{
|
||||
guint vmaj, vmin, vrev, build;
|
||||
|
||||
/* See if the DLL has been loaded successfully. Bail if it hasn't */
|
||||
if (AirpcapLoaded == FALSE) {
|
||||
g_string_append(str, "without AirPcap");
|
||||
without_feature(l, "AirPcap");
|
||||
return;
|
||||
}
|
||||
|
||||
g_PAirpcapGetVersion(&vmaj, &vmin, &vrev, &build);
|
||||
g_string_append_printf(str, "with AirPcap %d.%d.%d build %d", vmaj, vmin,
|
||||
vrev, build);
|
||||
with_feature(l, "AirPcap %d.%d.%d build %d", vmaj, vmin, vrev, build);
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
|
@ -16,6 +16,7 @@
|
|||
#define __AIRPCAP_LOADER_H__
|
||||
|
||||
#include <epan/crypt/dot11decrypt_system.h>
|
||||
#include <wsutil/feature_list.h>
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
|
@ -396,10 +397,10 @@ airpcap_if_clear_decryption_settings(airpcap_if_info_t* info_if);
|
|||
* Adds compiled version string to str
|
||||
*/
|
||||
void
|
||||
get_compiled_airpcap_version(GString *str);
|
||||
gather_airpcap_compile_info(feature_list l);
|
||||
|
||||
void
|
||||
get_runtime_airpcap_version(GString *str);
|
||||
gather_airpcap_runtime_info(feature_list l);
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
|
|
|
@ -231,7 +231,7 @@ gather_wireshark_qt_compiled_info(feature_list l)
|
|||
}
|
||||
#ifdef _WIN32
|
||||
#ifdef HAVE_AIRPCAP
|
||||
with_feature(l, "AirPcap");
|
||||
gather_airpcap_compile_info(l);
|
||||
#else
|
||||
without_feature(l, "AirPcap");
|
||||
#endif
|
||||
|
@ -259,14 +259,7 @@ gather_wireshark_runtime_info(feature_list l)
|
|||
epan_gather_runtime_info(l);
|
||||
|
||||
#ifdef HAVE_AIRPCAP
|
||||
/* See if the DLL has been loaded successfully. Bail if it hasn't */
|
||||
if (AirpcapLoaded == FALSE) {
|
||||
without_feature(l, "AirPcap");
|
||||
}
|
||||
else {
|
||||
g_PAirpcapGetVersion(&vmaj, &vmin, &vrev, &build);
|
||||
with_feature(l, "AirPcap %d.%d.%d build %d", vmaj, vmin, vrev, build);
|
||||
}
|
||||
gather_airpcap_runtime_info(l);
|
||||
#endif
|
||||
|
||||
if (wsApp) {
|
||||
|
|
|
@ -37,7 +37,7 @@ without_feature(feature_list l, const char *fmt, ...)
|
|||
static gint
|
||||
feature_sort_alpha(gconstpointer a, gconstpointer b)
|
||||
{
|
||||
return strcasecmp((gchar *)a + 1, (gchar *)b + 1);
|
||||
return g_ascii_strcasecmp((gchar *)a + 1, (gchar *)b + 1);
|
||||
}
|
||||
|
||||
void
|
||||
|
|
Loading…
Reference in New Issue