diff options
| author | irungentoo <irungentoo@gmail.com> | 2013-08-02 10:41:03 -0400 |
|---|---|---|
| committer | irungentoo <irungentoo@gmail.com> | 2013-08-02 10:41:03 -0400 |
| commit | b9176974a84ccf3b3baa8b4519ed9ea6ab75a629 (patch) | |
| tree | 32b0a997e3fbf4eb7ee6864550e881c7ade6a021 /core/LAN_discovery.h | |
| parent | 67efb67f963e66412c4aca38debd8c20af9f7ba8 (diff) | |
| parent | 20951dda7dfc0625fcbaccde4ec049ef6f2caeb6 (diff) | |
Merge branch 'master' into Jeffail-master
Conflicts:
core/DHT.c
Diffstat (limited to 'core/LAN_discovery.h')
| -rw-r--r-- | core/LAN_discovery.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/core/LAN_discovery.h b/core/LAN_discovery.h index 4ca65c03..96a6e6ad 100644 --- a/core/LAN_discovery.h +++ b/core/LAN_discovery.h | |||
| @@ -28,6 +28,13 @@ | |||
| 28 | 28 | ||
| 29 | #include "DHT.h" | 29 | #include "DHT.h" |
| 30 | 30 | ||
| 31 | /* used for get_broadcast() */ | ||
| 32 | #ifdef __linux | ||
| 33 | #include <sys/ioctl.h> | ||
| 34 | #include <arpa/inet.h> | ||
| 35 | #include <linux/netdevice.h> | ||
| 36 | #endif | ||
| 37 | |||
| 31 | #ifdef __cplusplus | 38 | #ifdef __cplusplus |
| 32 | extern "C" { | 39 | extern "C" { |
| 33 | #endif | 40 | #endif |