From 4e05b9b0431aff7b44f57c333288401caaf86300 Mon Sep 17 00:00:00 2001
From: Glenn L McGrath <bug1@ihug.co.nz>
Date: Sat, 7 Dec 2002 23:14:40 +0000
Subject: [PATCH] include "busybox" after the libc includes tofix compile
 errors

---
 init/reboot.c          | 4 +++-
 libbb/Makefile.in      | 4 ++--
 libpwdgrp/__getgrent.c | 4 ++--
 libpwdgrp/__getpwent.c | 4 ++--
 libpwdgrp/getpwuid.c   | 4 ++--
 libpwdgrp/pwent.c      | 3 +--
 libpwdgrp/shadow.c     | 4 ++--
 7 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/init/reboot.c b/init/reboot.c
index 1c9eedde5..872d9e741 100644
--- a/init/reboot.c
+++ b/init/reboot.c
@@ -21,18 +21,20 @@
  *
  */
 
-#include "busybox.h"
 #include <signal.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <getopt.h>
 
+#include "busybox.h"
+
 #if (__GNU_LIBRARY__ > 5) || defined(__dietlibc__) 
   #include <sys/reboot.h>
   #define init_reboot(magic) reboot(magic)
 #else
   #define init_reboot(magic) reboot(0xfee1dead, 672274793, magic)
 #endif
+
 #ifndef RB_ENABLE_CAD
 static const int RB_ENABLE_CAD = 0x89abcdef;
 static const int RB_AUTOBOOT = 0x01234567;
diff --git a/libbb/Makefile.in b/libbb/Makefile.in
index 4a6df77f7..e00fd2f51 100644
--- a/libbb/Makefile.in
+++ b/libbb/Makefile.in
@@ -24,8 +24,8 @@ LIBBB_DIR:=$(TOPDIR)libbb/
 endif
 
 LIBBB_SRC:= \
-	ask_confirmation.c chomp.c compare_string_array.c concat_path_file.c \
-	copy_file.c copy_file_chunk.c dump.c libc5.c device_open.c error_msg.c \
+	ask_confirmation.c chomp.c concat_path_file.c copy_file.c \
+	copy_file_chunk.c dump.c libc5.c device_open.c error_msg.c \
 	error_msg_and_die.c fgets_str.c find_mount_point.c find_pid_by_name.c \
 	find_root_device.c full_read.c full_write.c get_console.c \
 	get_last_path_component.c get_line_from_file.c  \
diff --git a/libpwdgrp/__getgrent.c b/libpwdgrp/__getgrent.c
index 5fb4193cb..392301048 100644
--- a/libpwdgrp/__getgrent.c
+++ b/libpwdgrp/__getgrent.c
@@ -18,11 +18,11 @@
  *
  */
 
-#include "busybox.h" 
-
 #include <unistd.h>
 #include <stdlib.h>
 #include <string.h>
+
+#include "busybox.h"
 #include "grp_.h"
 
 /*
diff --git a/libpwdgrp/__getpwent.c b/libpwdgrp/__getpwent.c
index d553250f4..1b38c27ef 100644
--- a/libpwdgrp/__getpwent.c
+++ b/libpwdgrp/__getpwent.c
@@ -18,13 +18,13 @@
  *
  */
 
-#include "busybox.h" 
-
 #include <stdlib.h>
 #include <unistd.h>
 #include <string.h>
 #include <fcntl.h>
+
 #include "pwd_.h"
+#include "busybox.h"
 
 #define PWD_BUFFER_SIZE 256
 
diff --git a/libpwdgrp/getpwuid.c b/libpwdgrp/getpwuid.c
index 819c874ac..23ff3aa88 100644
--- a/libpwdgrp/getpwuid.c
+++ b/libpwdgrp/getpwuid.c
@@ -18,12 +18,12 @@
  *
  */
 
-#include "busybox.h" 
-
 #include <stdlib.h>
 #include <unistd.h>
 #include <fcntl.h>
+
 #include "pwd_.h"
+#include "busybox.h"
 
 struct passwd *getpwuid(uid_t uid)
 {
diff --git a/libpwdgrp/pwent.c b/libpwdgrp/pwent.c
index 1f4239741..133fa4564 100644
--- a/libpwdgrp/pwent.c
+++ b/libpwdgrp/pwent.c
@@ -18,14 +18,13 @@
  *
  */
 
-#include "busybox.h" 
-
 #include <unistd.h>
 #include <stdlib.h>
 #include <errno.h>
 #include "pwd_.h"
 #include <fcntl.h>
 
+#include "busybox.h"
 /*
  * setpwent(), endpwent(), and getpwent() are included in the same object
  * file, since one cannot be used without the other two, so it makes sense to
diff --git a/libpwdgrp/shadow.c b/libpwdgrp/shadow.c
index c79417383..2d2b108f2 100644
--- a/libpwdgrp/shadow.c
+++ b/libpwdgrp/shadow.c
@@ -33,12 +33,12 @@
  *		  lckpwdf  ulckpwdf 
  */
 
-#include "busybox.h"
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
+
+#include "busybox.h"
 #include "shadow_.h"
 
 static FILE *shadow;