Fix QtShark compile error.

(Quoting can be tricky ...)

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40766 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/capture-wpcap.c b/capture-wpcap.c
index 26a7ca169bffd02e221a501c251571f5d28f7188..876cd980d60d9bdc644282f9484692acf737e2f5 100644 (file)
--- a/capture-wpcap.c
+++ b/capture-wpcap.c
@@ -32,6 +32,8 @@
 #include <glib.h>
 #include <gmodule.h>
 
+#include <epan/strutil.h>
+
 #include "capture_ifinfo.h"
 #include "capture-pcap-util.h"
 #include "capture-pcap-util-int.h"
@@ -903,7 +905,7 @@ cant_get_if_list_error_message(const char *err_str)
 void
 get_compiled_pcap_version(GString *str)
 {
-       g_string_append(str, "with WinPcap (" PCAP_VERSION ")");
+       g_string_append(str, "with WinPcap (" STRINGIFY(PCAP_VERSION) ")");
 }
 
 /*

diff --git a/config.nmake b/config.nmake
index d08d20121cb1aef9d3e0001474d6db341a78da18..4320d6fb96b90c1e44964facb46b6758294779e8 100644 (file)
--- a/config.nmake
+++ b/config.nmake
@@ -771,7 +771,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_="" /DPCAP_VERSION="\"$(PCAP_VERSION)\"" $(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