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

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
This commit is contained in:
Guy Harris 2005-03-23 01:55:11 +00:00
parent 46e1907f13
commit 596a4f865b
3 changed files with 1 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile.nmake
View 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 > $@

9
capture-wpcap.c
View 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)");

6
config.nmake
View 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