| author | mickeyl <mickeyl> | 2003-01-04 19:02:18 (UTC) |
|---|---|---|
| committer | mickeyl <mickeyl> | 2003-01-04 19:02:18 (UTC) |
| commit | cc2e88f07df8acaa32c39c0927c1c969fc6c98f8 (patch) (side-by-side diff) | |
| tree | 77832af18206739eee61336bc77dd8fa62c3f5d6 | |
| parent | 68400748895ca7c54ad312afdfe830150d53a801 (diff) | |
| download | opie-cc2e88f07df8acaa32c39c0927c1c969fc6c98f8.zip opie-cc2e88f07df8acaa32c39c0927c1c969fc6c98f8.tar.gz opie-cc2e88f07df8acaa32c39c0927c1c969fc6c98f8.tar.bz2 | |
revert "cleanup". extern C is necessary here [on linux] because of a collision
of net/bpf.h and pcap.h headers.
| -rw-r--r-- | noncore/net/wellenreiter/libwellenreiter/source/cardmode.hh | 4 | ||||
| -rw-r--r-- | noncore/net/wellenreiter/libwellenreiter/source/sniff.hh | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/noncore/net/wellenreiter/libwellenreiter/source/cardmode.hh b/noncore/net/wellenreiter/libwellenreiter/source/cardmode.hh index 6ec5b95..b85b7b7 100644 --- a/noncore/net/wellenreiter/libwellenreiter/source/cardmode.hh +++ b/noncore/net/wellenreiter/libwellenreiter/source/cardmode.hh @@ -7,14 +7,18 @@ #include <stdlib.h> #include <errno.h> #include <sys/types.h> #include <sys/time.h> #include <sys/socket.h> #include <netinet/in.h> + +extern "C" +{ #include <net/bpf.h> #include <pcap.h> +} /* 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 713b383..c7108ac 100644 --- a/noncore/net/wellenreiter/libwellenreiter/source/sniff.hh +++ b/noncore/net/wellenreiter/libwellenreiter/source/sniff.hh @@ -9,14 +9,18 @@ #include <errno.h> #include <sys/types.h> #include <sys/time.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 { |