diff options
| author | Denis Vlasenko <vda.linux@googlemail.com> | 2008-09-06 14:52:28 +0000 |
|---|---|---|
| committer | Denis Vlasenko <vda.linux@googlemail.com> | 2008-09-06 14:52:28 +0000 |
| commit | ee9deb863e089e1b607cc5771123257c3223bea0 (patch) | |
| tree | bb6740dc2bde5549a1ab8ce3667d8ae46057ebb8 | |
| parent | ee34ebe966554ad6b73d150b02cc506f9318fead (diff) | |
| download | busybox-w32-ee9deb863e089e1b607cc5771123257c3223bea0.tar.gz busybox-w32-ee9deb863e089e1b607cc5771123257c3223bea0.tar.bz2 busybox-w32-ee9deb863e089e1b607cc5771123257c3223bea0.zip | |
ifenslave: on uclibc at least, net/if.h + linux/if_bonding.h dont coexist
| -rw-r--r-- | networking/ifenslave.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/networking/ifenslave.c b/networking/ifenslave.c index 89a3f9e80..ae9745726 100644 --- a/networking/ifenslave.c +++ b/networking/ifenslave.c | |||
| @@ -100,11 +100,15 @@ | |||
| 100 | 100 | ||
| 101 | #include "libbb.h" | 101 | #include "libbb.h" |
| 102 | 102 | ||
| 103 | #include <net/if.h> | 103 | /* #include <net/if.h> - no. linux/if_bonding.h pulls in linux/if.h */ |
| 104 | #include <net/if_arp.h> | 104 | #include <net/if_arp.h> |
| 105 | #include <linux/if_bonding.h> | 105 | #include <linux/if_bonding.h> |
| 106 | #include <linux/sockios.h> | 106 | #include <linux/sockios.h> |
| 107 | 107 | ||
| 108 | #ifndef IFNAMSIZ | ||
| 109 | #define IFNAMSIZ 16 | ||
| 110 | #endif | ||
| 111 | |||
| 108 | typedef uint64_t u64; /* hack, so we may include kernel's ethtool.h */ | 112 | typedef uint64_t u64; /* hack, so we may include kernel's ethtool.h */ |
| 109 | typedef uint32_t u32; /* ditto */ | 113 | typedef uint32_t u32; /* ditto */ |
| 110 | typedef uint16_t u16; /* ditto */ | 114 | typedef uint16_t u16; /* ditto */ |