diff options
| author | Denys Vlasenko | 2009-07-10 18:37:06 +0200 |
|---|---|---|
| committer | Denys Vlasenko | 2009-07-10 18:37:06 +0200 |
| commit | 860d2bbdda67acfec39cd28e38881633ec4e66d6 (patch) | |
| tree | 284fe111111ba2e2f19deed779e34846e58e04ca | |
| parent | 874201fee5a57acf25efe1b0b9c7e58ef6ef98a5 (diff) | |
| download | busybox-860d2bbdda67acfec39cd28e38881633ec4e66d6.zip busybox-860d2bbdda67acfec39cd28e38881633ec4e66d6.tar.gz | |
fix fallout from BSD patches
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| -rw-r--r-- | miscutils/hdparm.c | 3 | ||||
| -rw-r--r-- | networking/udhcp/clientpacket.c | 9 | ||||
| -rw-r--r-- | networking/udhcp/clientsocket.c | 8 | ||||
| -rw-r--r-- | util-linux/mkfs_vfat.c | 3 |
4 files changed, 12 insertions, 11 deletions
diff --git a/miscutils/hdparm.c b/miscutils/hdparm.c index 362b212..6068223 100644 --- a/miscutils/hdparm.c +++ b/miscutils/hdparm.c @@ -11,9 +11,10 @@ * hdparm.c - Command line interface to get/set hard disk parameters * - by Mark Lord (C) 1994-2002 -- freely distributable */ +#include "libbb.h" +/* must be _after_ libbb.h: */ #include <linux/hdreg.h> #include <sys/mount.h> -#include "libbb.h" /* device types */ /* ------------ */ diff --git a/networking/udhcp/clientpacket.c b/networking/udhcp/clientpacket.c index 0a3e644..8ccdfcc 100644 --- a/networking/udhcp/clientpacket.c +++ b/networking/udhcp/clientpacket.c @@ -7,6 +7,10 @@ * * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. */ +#include "common.h" +#include "dhcpd.h" +#include "dhcpc.h" +#include "options.h" //#include <features.h> #if (defined(__GLIBC__) && __GLIBC__ >= 2 && __GLIBC_MINOR__ >= 1) || defined _NEWLIB_VERSION @@ -18,11 +22,6 @@ #include <linux/if_ether.h> #endif -#include "common.h" -#include "dhcpd.h" -#include "dhcpc.h" -#include "options.h" - /* Create a random xid */ uint32_t FAST_FUNC random_xid(void) diff --git a/networking/udhcp/clientsocket.c b/networking/udhcp/clientsocket.c index 0febc04..8e68f31 100644 --- a/networking/udhcp/clientsocket.c +++ b/networking/udhcp/clientsocket.c @@ -20,6 +20,10 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +#include "common.h" +#include "dhcpd.h" +#include "dhcpc.h" + //#include <features.h> #include <asm/types.h> @@ -32,10 +36,6 @@ #endif #include <linux/filter.h> -#include "common.h" -#include "dhcpd.h" -#include "dhcpc.h" - int FAST_FUNC udhcp_raw_socket(int ifindex) { int fd; diff --git a/util-linux/mkfs_vfat.c b/util-linux/mkfs_vfat.c index 8d12bab..dff10f9 100644 --- a/util-linux/mkfs_vfat.c +++ b/util-linux/mkfs_vfat.c @@ -7,6 +7,8 @@ * * Licensed under GPLv2, see file LICENSE in this tarball for details. */ +#include "libbb.h" + #include <linux/hdreg.h> /* HDIO_GETGEO */ #include <linux/fd.h> /* FDGETPRM */ #include <sys/mount.h> /* BLKSSZGET */ @@ -14,7 +16,6 @@ # define BLKSSZGET _IO(0x12, 104) #endif //#include <linux/msdos_fs.h> -#include "libbb.h" #include "volume_id/volume_id_internal.h" #define SECTOR_SIZE 512 |