It doesn't matter whether, when building with WinPcap, we have
authorguy <guy@f5534014-38df-0310-8fa8-9805f1628bb7>
Wed, 23 Mar 2005 01:55:11 +0000 (01:55 +0000)
committerguy <guy@f5534014-38df-0310-8fa8-9805f1628bb7>
Wed, 23 Mar 2005 01:55:11 +0000 (01:55 +0000)
pcap_lib_version() in the WinPcap on the system on which we're building.

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

Makefile.nmake
capture-wpcap.c
config.nmake

index 8c681ac33a3b432c02c16adc5a60ed2613ee7e4a..7022520aafd901f4182bc14c5a5e00b7ebb4cbe3 100644 (file)
@@ -205,7 +205,6 @@ config.h    : config.h.win32 config.nmake
            -e "s/@HAVE_PCAP_FINDALLDEVS@/$(PCAP_FINDALLDEVS_CONFIG)/" \
            -e "s/@HAVE_PCAP_DATALINK_NAME_TO_VAL@/$(PCAP_DATALINK_NAME_TO_VAL_CONFIG)/" \
            -e "s/@HAVE_PCAP_DATALINK_VAL_TO_NAME@/$(PCAP_DATALINK_VAL_TO_NAME_CONFIG)/" \
-           -e "s/@HAVE_PCAP_LIB_VERSION@/$(PCAP_LIB_VERSION_CONFIG)/" \
            -e "s/@HAVE_LIBETHEREALDLL@/$(LIBETHEREAL_CONFIG)/" \
            -e "s/@WPCAP_CONSTIFIED@/$(WPCAP_CONSTIFIED_CONFIG)/" \
            < config.h.win32 > $@
index 9163b2997d97c2fa5410f9609cb33a91e75814e6..85dbf849aba7447ee2b748f63999292c9307f95b 100644 (file)
@@ -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)");
index 59ee1b1a33ea8e5c4a9f7b9b690d5c0383ff0af5..865e747528454fcf4bd09e2961528e558612f444 100644 (file)
@@ -284,17 +284,11 @@ PCAP_FINDALLDEVS_CONFIG=
 PCAP_DATALINK_VAL_TO_NAME_CONFIG=
 WPCAP_CONSTIFIED=
 !ENDIF
-!IF "$(WINPCAP_VERSION)" == "3.1"
-PCAP_LIB_VERSION_CONFIG=^#define HAVE_PCAP_LIB_VERSION 1
-!ELSE
-PCAP_LIB_VERSION_CONFIG=
-!ENDIF
 !ELSE
 WINPCAP_CONFIG=
 PCAP_FINDALLDEVS_CONFIG=
 PCAP_DATALINK_NAME_TO_VAL_CONFIG=
 PCAP_DATALINK_VAL_TO_NAME_CONFIG=
-PCAP_LIB_VERSION_CONFIG=
 WPCAP_CONSTIFIED=
 !ENDIF