libpcap: Disable exposed bits of WinPCAP remote capture support

Disable bits of remote capture support inherited from the WinPCAP merge
which cause applications to fails to build if they define HAVE_REMOTE.

(From OE-Core rev: 4e412234c37efec42b3962c11d44903c0c58c92e)

Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Fabio Berton 2016-11-22 16:15:59 -02:00 committed by Richard Purdie
parent 5647a73fb1
commit 252898f56e
2 changed files with 37 additions and 0 deletions

View File

@ -0,0 +1,36 @@
Disable bits of remote capture support inherited from the WinPCAP merge
which cause applications to FTBFS if they define HAVE_REMOTE.
Patch from:
https://anonscm.debian.org/cgit/users/rfrancoise/libpcap.git/commit/?
id=f35949969269dfdcc3549b12fade604755e1e326
Upstream-Status: Pending
--- a/pcap/pcap.h
+++ b/pcap/pcap.h
@@ -506,6 +506,11 @@
#define MODE_STAT 1
#define MODE_MON 2
+#ifdef HAVE_REMOTE
+ /* Includes most of the public stuff that is needed for the remote capture */
+ #include <remote-ext.h>
+#endif /* HAVE_REMOTE */
+
#elif defined(MSDOS)
/*
@@ -526,11 +531,6 @@
#endif /* _WIN32/MSDOS/UN*X */
-#ifdef HAVE_REMOTE
- /* Includes most of the public stuff that is needed for the remote capture */
- #include <remote-ext.h>
-#endif /* HAVE_REMOTE */
-
#ifdef __cplusplus
}
#endif

View File

@ -4,6 +4,7 @@ SRC_URI += " \
file://libpcap-pkgconfig-support.patch \
file://0001-Fix-compiler_state_t.ai-usage-when-INET6-is-not-defi.patch \
file://0002-Add-missing-compiler_state_t-parameter.patch \
file://disable-remote.patch \
"
SRC_URI[md5sum] = "3d48f9cd171ff12b0efd9134b52f1447"