diff options
| author | Guy Harris <guy@alum.mit.edu> | 2005-03-23 01:55:11 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2005-03-23 01:55:11 +0000 |
| commit | 596a4f865b8fff0c679fcd1116b6b2c72b73d23f (patch) | |
| tree | 09fbbc4eb361e30dc62cfc263a0f73f6a1ad12d0 /capture-wpcap.c | |
| parent | 46e1907f136cd62ff768a9c509a0bf368024e141 (diff) | |
It doesn't matter whether, when building with WinPcap, we have
pcap_lib_version() in the WinPcap on the system on which we're building.
svn path=/trunk/; revision=13873
Diffstat (limited to 'capture-wpcap.c')
| -rw-r--r-- | capture-wpcap.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/capture-wpcap.c b/capture-wpcap.c index 9163b2997d..85dbf849ab 100644 --- a/capture-wpcap.c +++ b/capture-wpcap.c @@ -76,9 +76,7 @@ static int (*p_pcap_datalink_name_to_val) (const char *); #ifdef HAVE_PCAP_DATALINK_VAL_TO_NAME static const char *(*p_pcap_datalink_val_to_name) (int); #endif -#ifdef HAVE_PCAP_LIB_VERSION static const char *(*p_pcap_lib_version) (void); -#endif static int (*p_pcap_setbuff) (pcap_t *, int dim); typedef struct { @@ -118,9 +116,7 @@ load_wpcap(void) #ifdef HAVE_PCAP_DATALINK_VAL_TO_NAME SYM(pcap_datalink_val_to_name, TRUE), #endif -#ifdef HAVE_PCAP_LIB_VERSION SYM(pcap_lib_version, TRUE), -#endif SYM(pcap_setbuff, TRUE), { NULL, NULL, FALSE } }; @@ -632,12 +628,9 @@ get_runtime_pcap_version(GString *str) } g_string_sprintfa(str, "with "); -#ifdef HAVE_PCAP_LIB_VERSION if (p_pcap_lib_version != NULL) g_string_sprintfa(str, p_pcap_lib_version()); - else -#endif - if (packetVer != NULL) + else if (packetVer != NULL) g_string_sprintfa(str, "WinPcap (%s)", packetVer); else g_string_append(str, "WinPcap (version unknown)"); |