summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2003-01-04 19:02:18 (UTC)
committer mickeyl <mickeyl>2003-01-04 19:02:18 (UTC)
commitcc2e88f07df8acaa32c39c0927c1c969fc6c98f8 (patch) (unidiff)
tree77832af18206739eee61336bc77dd8fa62c3f5d6
parent68400748895ca7c54ad312afdfe830150d53a801 (diff)
downloadopie-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.
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/wellenreiter/libwellenreiter/source/cardmode.hh4
-rw-r--r--noncore/net/wellenreiter/libwellenreiter/source/sniff.hh4
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
@@ -10,8 +10,12 @@
10#include <sys/time.h> 10#include <sys/time.h>
11#include <sys/socket.h> 11#include <sys/socket.h>
12#include <netinet/in.h> 12#include <netinet/in.h>
13
14extern "C"
15{
13#include <net/bpf.h> 16#include <net/bpf.h>
14#include <pcap.h> 17#include <pcap.h>
18}
15 19
16/* Defines, used for the card setup */ 20/* Defines, used for the card setup */
17#define DEFAULT_PATH "/proc/driver/aironet/%s/Config" 21#define DEFAULT_PATH "/proc/driver/aironet/%s/Config"
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
@@ -12,8 +12,12 @@
12#include <sys/socket.h> 12#include <sys/socket.h>
13#include <netinet/in.h> 13#include <netinet/in.h>
14#include <arpa/inet.h> 14#include <arpa/inet.h>
15
16extern "C"
17{
15#include <net/bpf.h> 18#include <net/bpf.h>
16#include <pcap.h> 19#include <pcap.h>
20}
17 21
18#define NONBROADCASTING "non-broadcasting" 22#define NONBROADCASTING "non-broadcasting"
19 23