Remove superfluous config parameters

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

diff --git a/Makefile.nmake b/Makefile.nmake
index 013abaab2f8bf0a639c7030a746014c1681eeaa9..f96716dad497b83dfd4ba2b176ee51582a6abe0c 100644 (file)
--- a/Makefile.nmake
+++ b/Makefile.nmake
@@ -355,10 +355,8 @@ config.h   : config.h.win32 config.nmake
            -e "s/@HAVE_REMOTE@/$(PCAP_HAVE_REMOTE_CONFIG)/" \
            -e "s/@HAVE_PCAP_REMOTE@/$(PCAP_REMOTE_CONFIG)/" \
            -e "s/@HAVE_PCAP_OPEN@/$(PCAP_OPEN_CONFIG)/" \
-        -e "s/@HAVE_PCAP_LIST_DATALINKS@/$(PCAP_LIST_DATALINKS_CONFIG)/" \
-        -e "s/@HAVE_PCAP_SET_DATALINK@/$(PCAP_SET_DATALINK_CONFIG)/" \
-           -e "s/@HAVE_PCAP_FINDALLDEVS_EX@/$(PCAP_FINDALLDEVS_EX_CONFIG)/" \
-           -e "s/@HAVE_PCAP_CREATESRCSTR@/$(PCAP_CREATESRCSTR_CONFIG)/" \
+           -e "s/@HAVE_PCAP_LIST_DATALINKS@/$(PCAP_LIST_DATALINKS_CONFIG)/" \
+           -e "s/@HAVE_PCAP_SET_DATALINK@/$(PCAP_SET_DATALINK_CONFIG)/" \
            -e "s/@HAVE_PCAP_SETSAMPLING@/$(PCAP_SETSAMPLING_CONFIG)/" \
            -e "s/@HAVE_LIBWIRESHARKDLL@/$(LIBWIRESHARK_CONFIG)/" \
            -e "s/@HAVE_LIBGNUTLS@/$(GNUTLS_CONFIG)/" \

diff --git a/config.h.win32 b/config.h.win32
index 8c21e52deb1e23969b1c4cd07719acddd9604547..6c364cc2eaad7843230c98d7ece31ca1c59bcf95 100644 (file)
--- a/config.h.win32
+++ b/config.h.win32
@@ -72,8 +72,6 @@
 @HAVE_REMOTE@
 @HAVE_PCAP_REMOTE@
 @HAVE_PCAP_OPEN@
-@HAVE_PCAP_FINDALLDEVS_EX@
-@HAVE_PCAP_CREATESRCSTR@
 @HAVE_PCAP_SETSAMPLING@
 
 @HAVE_AIRPCAP@

diff --git a/config.nmake b/config.nmake
index e8a9d7184ca508c14b3431c47900e269a59b44b8..dd4f6882b8ca221f1ef2ef3f2fce2e94645a72e7 100644 (file)
--- a/config.nmake
+++ b/config.nmake
@@ -982,15 +982,11 @@ PCAP_SET_DATALINK_CONFIG=^#define HAVE_PCAP_SET_DATALINK 1
 PCAP_HAVE_REMOTE_CONFIG=^#define HAVE_REMOTE 1
 PCAP_REMOTE_CONFIG=^#define HAVE_PCAP_REMOTE 1
 PCAP_OPEN_CONFIG=^#define HAVE_PCAP_OPEN 1
-PCAP_FINDALLDEVS_EX_CONFIG=^#define HAVE_PCAP_FINDALLDEVS_EX 1
-PCAP_CREATESRCSTR_CONFIG=^#define HAVE_PCAP_CREATESRCSTR 1
 PCAP_SETSAMPLING_CONFIG=^#define HAVE_PCAP_SETSAMPLING 1
 !ELSE
 PCAP_HAVE_REMOTE_CONFIG=
 PCAP_REMOTE_CONFIG=
 PCAP_OPEN_CONFIG=
-PCAP_FINDALLDEVS_EX_CONFIG=
-PCAP_CREATESRCSTR_CONFIG=
 PCAP_SETSAMPLING_CONFIG=
 !ENDIF