emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

include "busybox" after the libc includes tofix compile errors

Browse Source
This commit is contained in:
Glenn L McGrath
2002-12-07 23:14:40 +00:00
parent 0325a1c9e3
commit 4e05b9b043
7 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
init/reboot.c
View File

@@ -21,18 +21,20 @@
* *
*/ */
#include "busybox.h"
#include <signal.h> #include <signal.h>
#include <stdlib.h> #include <stdlib.h>
#include <unistd.h> #include <unistd.h>
#include <getopt.h> #include <getopt.h>
#include "busybox.h"
#if (__GNU_LIBRARY__ > 5) || defined(__dietlibc__) #if (__GNU_LIBRARY__ > 5) || defined(__dietlibc__)
#include <sys/reboot.h> #include <sys/reboot.h>
#define init_reboot(magic) reboot(magic) #define init_reboot(magic) reboot(magic)
#else #else
#define init_reboot(magic) reboot(0xfee1dead, 672274793, magic) #define init_reboot(magic) reboot(0xfee1dead, 672274793, magic)
#endif #endif
#ifndef RB_ENABLE_CAD #ifndef RB_ENABLE_CAD
static const int RB_ENABLE_CAD = 0x89abcdef; static const int RB_ENABLE_CAD = 0x89abcdef;
static const int RB_AUTOBOOT = 0x01234567; static const int RB_AUTOBOOT = 0x01234567;

4
libbb/Makefile.in
View File

@@ -24,8 +24,8 @@ LIBBB_DIR:=$(TOPDIR)libbb/
endif endif
LIBBB_SRC:= \ LIBBB_SRC:= \
ask_confirmation.c chomp.c compare_string_array.c concat_path_file.c \ ask_confirmation.c chomp.c concat_path_file.c copy_file.c \
copy_file.c copy_file_chunk.c dump.c libc5.c device_open.c error_msg.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 \ 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 \ find_root_device.c full_read.c full_write.c get_console.c \
get_last_path_component.c get_line_from_file.c \ get_last_path_component.c get_line_from_file.c \

4
libpwdgrp/__getgrent.c
View File

@@ -18,11 +18,11 @@
* *
*/ */
#include "busybox.h"
#include <unistd.h> #include <unistd.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include "busybox.h"
#include "grp_.h" #include "grp_.h"
/* /*

4
libpwdgrp/__getpwent.c
View File

@@ -18,13 +18,13 @@
* *
*/ */
#include "busybox.h"
#include <stdlib.h> #include <stdlib.h>
#include <unistd.h> #include <unistd.h>
#include <string.h> #include <string.h>
#include <fcntl.h> #include <fcntl.h>
#include "pwd_.h" #include "pwd_.h"
#include "busybox.h"
#define PWD_BUFFER_SIZE 256 #define PWD_BUFFER_SIZE 256

4
libpwdgrp/getpwuid.c
View File

@@ -18,12 +18,12 @@
* *
*/ */
#include "busybox.h"
#include <stdlib.h> #include <stdlib.h>
#include <unistd.h> #include <unistd.h>
#include <fcntl.h> #include <fcntl.h>
#include "pwd_.h" #include "pwd_.h"
#include "busybox.h"
struct passwd *getpwuid(uid_t uid) struct passwd *getpwuid(uid_t uid)
{ {

3
libpwdgrp/pwent.c
View File

@@ -18,14 +18,13 @@
* *
*/ */
#include "busybox.h"
#include <unistd.h> #include <unistd.h>
#include <stdlib.h> #include <stdlib.h>
#include <errno.h> #include <errno.h>
#include "pwd_.h" #include "pwd_.h"
#include <fcntl.h> #include <fcntl.h>
#include "busybox.h"
/* /*
* setpwent(), endpwent(), and getpwent() are included in the same object * 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 * file, since one cannot be used without the other two, so it makes sense to

4
libpwdgrp/shadow.c
View File

@@ -33,12 +33,12 @@
* lckpwdf ulckpwdf * lckpwdf ulckpwdf
*/ */
#include "busybox.h"
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <unistd.h> #include <unistd.h>
#include "busybox.h"
#include "shadow_.h" #include "shadow_.h"
static FILE *shadow; static FILE *shadow;