osmocom
/
wireshark
14
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Since we know the version of WinPcap we're compiling against, go ahead and display it instead of displaying "version unknown". 

svn path=/trunk/; revision=40740
This commit is contained in:
Chris Maynard 2012-01-27 03:41:20 +00:00
parent 17885e4130
commit 6d213e71bd
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
capture-wpcap.c
View File

@ -903,7 +903,7 @@ cant_get_if_list_error_message(const char *err_str)
void
get_compiled_pcap_version(GString *str)
{
g_string_append(str, "with WinPcap (version unknown)");
g_string_append(str, "with WinPcap (" PCAP_VERSION ")");
}
/*

2
config.nmake
View File

@ -769,7 +769,7 @@ LOCAL_CFLAGS= $(LOCAL_CFLAGS) /analyze:WX-
!ENDIF
#STANDARD_CFLAGS are flags used for *Wireshark* compiles (not stuff like lemon, etc)
STANDARD_CFLAGS=-DHAVE_CONFIG_H -D_U_="" $(LOCAL_CFLAGS) $(WARNINGS_CFLAGS)
STANDARD_CFLAGS=-DHAVE_CONFIG_H -D_U_="" /DPCAP_VERSION="\"$(PCAP_VERSION)\"" $(LOCAL_CFLAGS) $(WARNINGS_CFLAGS)
#Comment out the following if warnings are not to be treated as errors
WARNINGS_ARE_ERRORS=-WX