author | mickeyl <mickeyl> | 2002-12-11 13:10:26 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2002-12-11 13:10:26 (UTC) |
commit | 57a776c8345422a0fc32b3fb9d604be1c050d201 (patch) (side-by-side diff) | |
tree | 30d484143b11fe69f39c94078dc614ce78d40566 | |
parent | 84d92e2298605f4d4f9a9209731f62c2b10e54e4 (diff) | |
download | opie-57a776c8345422a0fc32b3fb9d604be1c050d201.zip opie-57a776c8345422a0fc32b3fb9d604be1c050d201.tar.gz opie-57a776c8345422a0fc32b3fb9d604be1c050d201.tar.bz2 |
fix for g++ complaining about different linking schemes:
/usr/include/net/bpf.h:408: previous declaration of `u_int bpf_filter(bpf_insn*, u_char*, unsigned int, unsigned int)' with C++ linkage
/usr/include/pcap.h:201: conflicts with new declaration with C linkage
/usr/include/net/bpf.h:407: previous declaration of `int bpf_validate(bpf_insn*, int)' with C++ linkage
/usr/include/pcap.h:202: conflicts with new declaration with C linkage
-rw-r--r-- | noncore/net/wellenreiter/libwellenreiter/source/cardmode.hh | 6 | ||||
-rw-r--r-- | noncore/net/wellenreiter/libwellenreiter/source/sniff.hh | 6 |
2 files changed, 10 insertions, 2 deletions
diff --git a/noncore/net/wellenreiter/libwellenreiter/source/cardmode.hh b/noncore/net/wellenreiter/libwellenreiter/source/cardmode.hh index 976ceeb..a3f8280 100644 --- a/noncore/net/wellenreiter/libwellenreiter/source/cardmode.hh +++ b/noncore/net/wellenreiter/libwellenreiter/source/cardmode.hh @@ -1,21 +1,25 @@ /* $Id$ */ #ifndef CARDMODE_HH #define CARDMODE_HH #include <string.h> #include <stdlib.h> -#include <pcap.h> #include <errno.h> #include <sys/socket.h> #include <netinet/in.h> #include <arpa/inet.h> + +extern "C" +{ #include <net/bpf.h> +#include <pcap.h> +} #include "../../libwellenreiter/source/log.hh" /* Defines, used for the card setup */ #define DEFAULT_PATH "/proc/driver/aironet/%s/Config" #define CARD_TYPE_CISCO 1 #define CARD_TYPE_NG 2 #define CARD_TYPE_HOSTAP 3 diff --git a/noncore/net/wellenreiter/libwellenreiter/source/sniff.hh b/noncore/net/wellenreiter/libwellenreiter/source/sniff.hh index 60cdc43..c13461a 100644 --- a/noncore/net/wellenreiter/libwellenreiter/source/sniff.hh +++ b/noncore/net/wellenreiter/libwellenreiter/source/sniff.hh @@ -1,22 +1,26 @@ /* $Id$ */ #ifndef SNIFF_HH #define SNIFF_HH #include <string.h> #include <stdio.h> #include <stdlib.h> -#include <pcap.h> #include <errno.h> #include <sys/socket.h> #include <netinet/in.h> #include <arpa/inet.h> + +extern "C" +{ #include <net/bpf.h> +#include <pcap.h> +} #define NONBROADCASTING "non-broadcasting" /* holds all the interresting data */ struct packetinfo { int isvalid; int pktlen; |