diff options
author | cmaynard <cmaynard@f5534014-38df-0310-8fa8-9805f1628bb7> | 2012-01-27 03:41:20 +0000 |
---|---|---|
committer | cmaynard <cmaynard@f5534014-38df-0310-8fa8-9805f1628bb7> | 2012-01-27 03:41:20 +0000 |
commit | 3344c1803210033af916ba8e4bf949d8ab5e8742 (patch) | |
tree | da7143145f8a113811198aca2308c7f076282502 | |
parent | f715a8a58d2b45333dd47ad904158fc607ee8675 (diff) |
Since we know the version of WinPcap we're compiling against, go ahead and display it instead of displaying "version unknown".
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40740 f5534014-38df-0310-8fa8-9805f1628bb7
-rw-r--r-- | capture-wpcap.c | 2 | ||||
-rw-r--r-- | config.nmake | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/capture-wpcap.c b/capture-wpcap.c index 02622a3506..26a7ca169b 100644 --- a/capture-wpcap.c +++ b/capture-wpcap.c @@ -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 ")"); } /* diff --git a/config.nmake b/config.nmake index 72290f64b7..f858eae404 100644 --- a/config.nmake +++ b/config.nmake @@ -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 |